From 9eed20da13d726aced7e87484a476cb0c5f3ca08 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 00:45:33 +0200
Subject: [PATCH 01/17] Implement offchain::SendTransactionTypes

---
 runtime/polkadot/src/lib.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 102b328b6866..49d1e551b77e 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -59,7 +59,6 @@ use frame_support::{
 };
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
-use system::offchain::TransactionSubmitter;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::{historical as session_historical};
 
@@ -153,6 +152,13 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 }
 
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
@@ -319,7 +325,6 @@ impl staking::Trait for Runtime {
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
-	type SubmitTransaction = TransactionSubmitter<(), Runtime, UncheckedExtrinsic>;
 }
 
 parameter_types! {
@@ -464,8 +469,6 @@ impl offences::Trait for Runtime {
 
 impl authority_discovery::Trait for Runtime {}
 
-type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
-
 parameter_types! {
 	pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _;
 }
@@ -473,8 +476,6 @@ parameter_types! {
 impl im_online::Trait for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
-	type Call = Call;
-	type SubmitTransaction = SubmitTransaction;
 	type SessionDuration = SessionDuration;
 	type ReportUnresponsiveness = Offences;
 }

From f219e495b7c68337ee03138960fa7b9a8a946b7f Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 00:57:24 +0200
Subject: [PATCH 02/17] Fix test-runtime

---
 runtime/test-runtime/src/lib.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index b2b5c45a28ef..872dc706e9f5 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -141,6 +141,13 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 }
 
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 parameter_types! {
 	pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
 	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
@@ -290,7 +297,6 @@ impl staking::Trait for Runtime {
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
-	type SubmitTransaction = system::offchain::TransactionSubmitter<(), Runtime, Extrinsic>;
 }
 
 impl grandpa::Trait for Runtime {

From df45cb42d7deec1fc9666f88ec6e1b71eabd0ed1 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 00:57:29 +0200
Subject: [PATCH 03/17] Fix Kusama

---
 runtime/kusama/src/lib.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index ddd0f29690a2..7086956dab24 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -55,7 +55,6 @@ use frame_support::{
 };
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
-use system::offchain::TransactionSubmitter;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::{historical as session_historical};
 
@@ -312,7 +311,6 @@ impl staking::Trait for Runtime {
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
-	type SubmitTransaction = TransactionSubmitter<(), Runtime, UncheckedExtrinsic>;
 }
 
 parameter_types! {
@@ -456,8 +454,6 @@ impl offences::Trait for Runtime {
 
 impl authority_discovery::Trait for Runtime {}
 
-type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
-
 parameter_types! {
 	pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _;
 }
@@ -465,8 +461,6 @@ parameter_types! {
 impl im_online::Trait for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
-	type Call = Call;
-	type SubmitTransaction = SubmitTransaction;
 	type ReportUnresponsiveness = Offences;
 	type SessionDuration = SessionDuration;
 }

From 6e5e587422574c8a1fad79930509fa9aa8bca3d8 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 00:58:16 +0200
Subject: [PATCH 04/17] Add SendTransactiontypes to Kusama

---
 runtime/kusama/src/lib.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 7086956dab24..01bb9e15eb63 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -144,6 +144,13 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 }
 
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;

From 602fff33821cfbe62fb47bb0d90bffc7bb9f1009 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 01:10:40 +0200
Subject: [PATCH 05/17] impl SendTransactiontypes for parachains and registrar

---
 runtime/common/src/parachains.rs | 8 +++++++-
 runtime/common/src/registrar.rs  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 20ff0cf4a31f..ba090828e5c2 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1601,6 +1601,13 @@ mod tests {
 		type OnKilledAccount = ();
 	}
 
+	impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+		Call: From<C>,
+	{
+		type OverarchingCall = Call;
+		type Extrinsic = UncheckedExtrinsic;
+	}
+
 	parameter_types! {
 		pub const Period: BlockNumber = 1;
 		pub const Offset: BlockNumber = 0;
@@ -1729,7 +1736,6 @@ mod tests {
 		type NextNewSession = Session;
 		type ElectionLookahead = ElectionLookahead;
 		type Call = Call;
-		type SubmitTransaction = system::offchain::TransactionSubmitter<(), Test, TestXt<Call, ()>>;
 	}
 
 	impl attestations::Trait for Test {
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index ee9f19345f92..373fd3460987 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -735,6 +735,13 @@ mod tests {
 		type OnKilledAccount = Balances;
 	}
 
+	impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+		Call: From<C>,
+	{
+		type OverarchingCall = Call;
+		type Extrinsic = UncheckedExtrinsic;
+	}
+
 	parameter_types! {
 		pub const ExistentialDeposit: Balance = 1;
 	}
@@ -823,7 +830,6 @@ mod tests {
 		type NextNewSession = Session;
 		type ElectionLookahead = ElectionLookahead;
 		type Call = Call;
-		type SubmitTransaction = system::offchain::TransactionSubmitter<(), Test, TestXt<Call, ()>>;
 	}
 
 	impl timestamp::Trait for Test {

From e38f271352056ecab3451b3d56c607d7c4e02517 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 01:16:10 +0200
Subject: [PATCH 06/17] Fix typos

---
 runtime/common/src/parachains.rs | 2 +-
 runtime/common/src/registrar.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index ba090828e5c2..8261b7f95d42 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1601,7 +1601,7 @@ mod tests {
 		type OnKilledAccount = ();
 	}
 
-	impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	impl<C> system::offchain::SendTransactionTypes<C> for Test where
 		Call: From<C>,
 	{
 		type OverarchingCall = Call;
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index 373fd3460987..bc44766d2ea4 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -735,7 +735,7 @@ mod tests {
 		type OnKilledAccount = Balances;
 	}
 
-	impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	impl<C> system::offchain::SendTransactionTypes<C> for Test where
 		Call: From<C>,
 	{
 		type OverarchingCall = Call;

From dea04018d872cdea2d03aaf574ead1364799762f Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Wed, 8 Apr 2020 01:21:20 +0200
Subject: [PATCH 07/17] Provided extrinsic type

---
 runtime/common/src/parachains.rs | 2 +-
 runtime/common/src/registrar.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 8261b7f95d42..d18cda22b238 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1605,7 +1605,7 @@ mod tests {
 		Call: From<C>,
 	{
 		type OverarchingCall = Call;
-		type Extrinsic = UncheckedExtrinsic;
+		type Extrinsic = TestXt<Call, ()>;
 	}
 
 	parameter_types! {
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index bc44766d2ea4..4c87bfe17b3a 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -739,7 +739,7 @@ mod tests {
 		Call: From<C>,
 	{
 		type OverarchingCall = Call;
-		type Extrinsic = UncheckedExtrinsic;
+		type Extrinsic = TestXt<Call, ()>;
 	}
 
 	parameter_types! {

From 30758929879e34cdbb1dcce2bb582b71c3dfca67 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 00:01:07 +0200
Subject: [PATCH 08/17] Implement AppCrypto for signing transactions

---
 runtime/common/src/parachains.rs | 46 +++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 9eee6147a02f..6b2ca2829093 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -35,7 +35,7 @@ use sp_staking::{
 };
 use frame_support::{
 	traits::KeyOwnerProofSystem,
-	dispatch::{IsSubType},
+	dispatch::IsSubType,
 	weights::{SimpleDispatchInfo, Weight, MINIMUM_WEIGHT},
 };
 use primitives::{
@@ -59,11 +59,30 @@ use inherents::{ProvideInherent, InherentData, MakeFatalError, InherentIdentifie
 
 use system::{
 	ensure_none, ensure_signed,
-	offchain::SubmitSignedTransaction,
+	offchain::{CreateSignedTransaction, SendSignedTransaction, Signer},
 };
 use crate::attestations::{self, IncludedBlocks};
 use crate::registrar::Registrar;
 
+pub const KEY_TYPE: KeyTypeId = KeyTypeId(*b"para");
+
+pub mod crypto {
+	use super::KEY_TYPE;
+	use sp_runtime::{
+		app_crypto::{app_crypto, sr25519},
+		traits::Verify,
+	};
+	use sp_core::sr25519::Signature as Sr25519Signature;
+	app_crypto!(sr25519, KEY_TYPE);
+
+	pub struct AuthorityId;
+	impl system::offchain::AppCrypto<<Sr25519Signature as Verify>::Signer, Sr25519Signature> for AuthorityId {
+		type RuntimeAppPublic = Public;
+		type GenericSignature = Sr25519Signature;
+		type GenericPublic = sp_core::sr25519::Public;
+	}
+}
+
 // ranges for iteration of general block number don't work, so this
 // is a utility to get around that.
 struct BlockNumberRange<N> {
@@ -220,7 +239,10 @@ impl GetSessionNumber for session::historical::Proof {
 	}
 }
 
-pub trait Trait: attestations::Trait + session::historical::Trait {
+pub trait Trait: CreateSignedTransaction<Call<Self>> + attestations::Trait + session::historical::Trait {
+	// The transaction signing authority
+	type AuthorityId: system::offchain::AppCrypto<Self::Public, Self::Signature>;
+
 	/// The outer origin type.
 	type Origin: From<Origin> + From<system::RawOrigin<Self::AccountId>>;
 
@@ -293,9 +315,6 @@ pub trait Trait: attestations::Trait + session::historical::Trait {
 
 	/// A type that converts the opaque hash type to exact one.
 	type BlockHashConversion: Convert<Self::Hash, primitives::Hash>;
-
-	/// Submit a signed transaction.
-	type SubmitSignedTransaction: SubmitSignedTransaction<Self, <Self as Trait>::Call>;
 }
 
 /// Origin for the parachains module.
@@ -794,15 +813,12 @@ impl<T: Trait> Module<T> {
 	pub fn submit_double_vote_report(
 		report: DoubleVoteReport<T::Proof>,
 	) -> Option<()> {
-		let call = Call::report_double_vote(report);
-
-		let res = T::SubmitSignedTransaction::submit_signed(call);
-
-		if res.iter().any(|(_, r)| r.is_ok()) {
-			Some(())
-		} else {
-			None
-		}
+		Signer::<T, T::AuthorityId>::any_account()
+			.send_signed_transaction(
+				move |_account| {
+					Call::report_double_vote(report.clone())
+				}
+			).map(|_| ())
 	}
 
 	/// Dispatch some messages from a parachain.

From 3cdcf543e78aae55519343bd95cc7863caa4a8de Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 12:08:11 +0200
Subject: [PATCH 09/17] Add signing capabilities to runtime

---
 runtime/kusama/src/lib.rs   | 50 +++++++++++++++++++++++-------------
 runtime/polkadot/src/lib.rs | 51 ++++++++++++++++++++++++-------------
 runtime/westend/src/lib.rs  | 49 ++++++++++++++++++++++-------------
 3 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 16cd886e7ae7..8e5d58b2856b 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -32,6 +32,7 @@ use runtime_common::{attestations, claims, parachains, registrar, slots,
 	NegativeImbalance, BlockHashCount, MaximumBlockWeight, AvailableBlockRatio,
 	MaximumBlockLength,
 };
+use sp_core::sr25519;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, Perquintill, RuntimeDebug,
@@ -41,7 +42,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		BlakeTwo256, Block as BlockT, SignedExtension, OpaqueKeys, ConvertInto, IdentityLookup,
-		DispatchInfoOf, Extrinsic as ExtrinsicT, SaturatedConversion,
+		DispatchInfoOf, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
 	},
 };
 #[cfg(feature = "runtime-benchmarks")]
@@ -154,13 +155,6 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 }
 
-impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
-	Call: From<C>,
-{
-	type OverarchingCall = Call;
-	type Extrinsic = UncheckedExtrinsic;
-}
-
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
@@ -523,6 +517,7 @@ parameter_types! {
 }
 
 impl parachains::Trait for Runtime {
+	type AuthorityId = FishermanAuthorityId;
 	type Origin = Origin;
 	type Call = Call;
 	type ParachainCurrency = Balances;
@@ -542,17 +537,22 @@ impl parachains::Trait for Runtime {
 	type IdentificationTuple = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, Vec<u8>)>>::IdentificationTuple;
 	type ReportOffence = Offences;
 	type BlockHashConversion = sp_runtime::traits::Identity;
-	type SubmitSignedTransaction = TransactionSubmitter<parachain::FishermanId, Runtime, UncheckedExtrinsic>;
 }
 
-impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtime {
-	type Public = <primitives::Signature as sp_runtime::traits::Verify>::Signer;
-	type Signature = primitives::Signature;
+pub struct FishermanAuthorityId;
+impl system::offchain::AppCrypto<<Signature as Verify>::Signer, Signature> for FishermanAuthorityId {
+	type RuntimeAppPublic = parachain::FishermanId;
+	type GenericSignature = sr25519::Signature;
+	type GenericPublic = sr25519::Public;
+}
 
-	fn create_transaction<TSigner: system::offchain::Signer<Self::Public, Self::Signature>>(
-		call: <UncheckedExtrinsic as ExtrinsicT>::Call,
-		public: Self::Public,
-		account: <Runtime as system::Trait>::AccountId,
+impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	Call: From<LocalCall>,
+{
+	fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+		call: Call,
+		public: <Signature as Verify>::Signer,
+		account: AccountId,
 		nonce: <Runtime as system::Trait>::Index,
 	) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 		let period = BlockHashCount::get()
@@ -576,14 +576,28 @@ impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtim
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
-			debug::warn!("Unable to create signed payload: {:?}", e)
+			debug::warn!("Unable to create signed payload: {:?}", e);
 		}).ok()?;
-		let signature = TSigner::sign(public, &raw_payload)?;
+		let signature = raw_payload.using_encoded(|payload| {
+			C::sign(payload, public)
+		})?;
 		let (call, extra, _) = raw_payload.deconstruct();
 		Some((call, (account, signature, extra)))
 	}
 }
 
+impl system::offchain::SigningTypes for Runtime {
+	type Public = <Signature as Verify>::Signer;
+	type Signature = Signature;
+}
+
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 parameter_types! {
 	pub const ParathreadDeposit: Balance = 5 * DOLLARS;
 	pub const QueueSize: usize = 2;
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index e0b6cc85c508..0157aa262f8e 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -33,6 +33,7 @@ use primitives::{
 	AccountId, AccountIndex, Balance, BlockNumber, Hash, Nonce, Signature, Moment,
 	parachain::{self, ActiveParas, AbridgedCandidateReceipt, SigningContext}, ValidityError,
 };
+use sp_core::sr25519;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	ApplyExtrinsicResult, KeyTypeId, Percent, Permill, Perbill, Perquintill, RuntimeDebug,
@@ -43,6 +44,7 @@ use sp_runtime::{
 	traits::{
 		BlakeTwo256, Block as BlockT, SignedExtension, OpaqueKeys, ConvertInto,
 		DispatchInfoOf, IdentityLookup, Extrinsic as ExtrinsicT, SaturatedConversion,
+		Verify,
 	},
 };
 #[cfg(feature = "runtime-benchmarks")]
@@ -60,7 +62,7 @@ use frame_support::{
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-use session::{historical as session_historical};
+use session::historical as session_historical;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -159,13 +161,6 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 }
 
-impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
-	Call: From<C>,
-{
-	type OverarchingCall = Call;
-	type Extrinsic = UncheckedExtrinsic;
-}
-
 impl scheduler::Trait for Runtime {
 	type Event = Event;
 	type Origin = Origin;
@@ -529,6 +524,7 @@ parameter_types! {
 }
 
 impl parachains::Trait for Runtime {
+	type AuthorityId = FishermanAuthorityId;
 	type Origin = Origin;
 	type Call = Call;
 	type ParachainCurrency = Balances;
@@ -548,17 +544,22 @@ impl parachains::Trait for Runtime {
 	type IdentificationTuple = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, Vec<u8>)>>::IdentificationTuple;
 	type ReportOffence = Offences;
 	type BlockHashConversion = sp_runtime::traits::Identity;
-	type SubmitSignedTransaction = TransactionSubmitter<parachain::FishermanId, Runtime, UncheckedExtrinsic>;
 }
 
-impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtime {
-	type Public = <primitives::Signature as sp_runtime::traits::Verify>::Signer;
-	type Signature = primitives::Signature;
+pub struct FishermanAuthorityId;
+impl system::offchain::AppCrypto<<Signature as Verify>::Signer, Signature> for FishermanAuthorityId {
+	type RuntimeAppPublic = parachain::FishermanId;
+	type GenericSignature = sr25519::Signature;
+	type GenericPublic = sr25519::Public;
+}
 
-	fn create_transaction<TSigner: system::offchain::Signer<Self::Public, Self::Signature>>(
-		call: <UncheckedExtrinsic as ExtrinsicT>::Call,
-		public: Self::Public,
-		account: <Runtime as system::Trait>::AccountId,
+impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	Call: From<LocalCall>,
+{
+	fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+		call: Call,
+		public: <Signature as Verify>::Signer,
+		account: AccountId,
 		nonce: <Runtime as system::Trait>::Index,
 	) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 		let period = BlockHashCount::get()
@@ -582,14 +583,28 @@ impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtim
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
-			debug::warn!("Unable to create signed payload: {:?}", e)
+			debug::warn!("Unable to create signed payload: {:?}", e);
 		}).ok()?;
-		let signature = TSigner::sign(public, &raw_payload)?;
+		let signature = raw_payload.using_encoded(|payload| {
+			C::sign(payload, public)
+		})?;
 		let (call, extra, _) = raw_payload.deconstruct();
 		Some((call, (account, signature, extra)))
 	}
 }
 
+impl system::offchain::SigningTypes for Runtime {
+	type Public = <Signature as Verify>::Signer;
+	type Signature = Signature;
+}
+
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 parameter_types! {
 	pub const ParathreadDeposit: Balance = 500 * DOLLARS;
 	pub const QueueSize: usize = 2;
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 96263c05e8ed..e45108490fe3 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -30,6 +30,7 @@ use runtime_common::{attestations, parachains, registrar,
 	impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor},
 	BlockHashCount, MaximumBlockWeight, AvailableBlockRatio, MaximumBlockLength,
 };
+use sp_core::sr25519;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	ApplyExtrinsicResult, KeyTypeId, Perbill, Perquintill, RuntimeDebug,
@@ -40,7 +41,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		BlakeTwo256, Block as BlockT, SignedExtension, OpaqueKeys, ConvertInto, IdentityLookup,
-		DispatchInfoOf, StaticLookup, Extrinsic as ExtrinsicT, SaturatedConversion,
+		DispatchInfoOf, StaticLookup, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
 	},
 };
 #[cfg(feature = "runtime-benchmarks")]
@@ -57,7 +58,6 @@ use frame_support::{
 };
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
-use system::offchain::TransactionSubmitter;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::{historical as session_historical};
 
@@ -313,7 +313,6 @@ impl staking::Trait for Runtime {
 	type NextNewSession = Session;
 	type ElectionLookahead = ElectionLookahead;
 	type Call = Call;
-	type SubmitTransaction = TransactionSubmitter<(), Runtime, UncheckedExtrinsic>;
 	type UnsignedPriority = StakingUnsignedPriority;
 }
 
@@ -337,8 +336,6 @@ impl offences::Trait for Runtime {
 
 impl authority_discovery::Trait for Runtime {}
 
-type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
-
 parameter_types! {
 	pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _;
 }
@@ -351,8 +348,6 @@ parameter_types! {
 impl im_online::Trait for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
-	type Call = Call;
-	type SubmitTransaction = SubmitTransaction;
 	type ReportUnresponsiveness = Offences;
 	type SessionDuration = SessionDuration;
 	type UnsignedPriority = StakingUnsignedPriority;
@@ -392,6 +387,7 @@ parameter_types! {
 }
 
 impl parachains::Trait for Runtime {
+	type AuthorityId = FishermanAuthorityId;
 	type Origin = Origin;
 	type Call = Call;
 	type ParachainCurrency = Balances;
@@ -411,17 +407,22 @@ impl parachains::Trait for Runtime {
 	type IdentificationTuple = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, Vec<u8>)>>::IdentificationTuple;
 	type ReportOffence = Offences;
 	type BlockHashConversion = sp_runtime::traits::Identity;
-	type SubmitSignedTransaction = TransactionSubmitter<parachain::FishermanId, Runtime, UncheckedExtrinsic>;
 }
 
-impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtime {
-	type Public = <primitives::Signature as sp_runtime::traits::Verify>::Signer;
-	type Signature = primitives::Signature;
+pub struct FishermanAuthorityId;
+impl system::offchain::AppCrypto<<Signature as Verify>::Signer, Signature> for FishermanAuthorityId {
+	type RuntimeAppPublic = parachain::FishermanId;
+	type GenericSignature = sr25519::Signature;
+	type GenericPublic = sr25519::Public;
+}
 
-	fn create_transaction<TSigner: system::offchain::Signer<Self::Public, Self::Signature>>(
-		call: <UncheckedExtrinsic as ExtrinsicT>::Call,
-		public: Self::Public,
-		account: <Runtime as system::Trait>::AccountId,
+impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	Call: From<LocalCall>,
+{
+	fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+		call: Call,
+		public: <Signature as Verify>::Signer,
+		account: AccountId,
 		nonce: <Runtime as system::Trait>::Index,
 	) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 		let period = BlockHashCount::get()
@@ -445,14 +446,28 @@ impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtim
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
-			debug::warn!("Unable to create signed payload: {:?}", e)
+			debug::warn!("Unable to create signed payload: {:?}", e);
 		}).ok()?;
-		let signature = TSigner::sign(public, &raw_payload)?;
+		let signature = raw_payload.using_encoded(|payload| {
+			C::sign(payload, public)
+		})?;
 		let (call, extra, _) = raw_payload.deconstruct();
 		Some((call, (account, signature, extra)))
 	}
 }
 
+impl system::offchain::SigningTypes for Runtime {
+	type Public = <Signature as Verify>::Signer;
+	type Signature = Signature;
+}
+
+impl<C> system::offchain::SendTransactionTypes<C> for Runtime where
+	Call: From<C>,
+{
+	type OverarchingCall = Call;
+	type Extrinsic = UncheckedExtrinsic;
+}
+
 parameter_types! {
 	pub const ParathreadDeposit: Balance = 5 * DOLLARS;
 	pub const QueueSize: usize = 2;

From 27837f995707d4ca16d7cf2ceac18ebafea9ef5f Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 12:29:05 +0200
Subject: [PATCH 10/17] Fix test runtimes

---
 runtime/common/src/parachains.rs | 31 ++++++++++++++++---------------
 runtime/common/src/registrar.rs  | 31 ++++++++++++++++---------------
 runtime/test-runtime/src/lib.rs  | 32 +++++++++++++++++++-------------
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 6b2ca2829093..92c2542244cd 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1860,9 +1860,16 @@ mod tests {
 
 		pub type ReporterId = app::Public;
 		pub type ReporterSignature = app::Signature;
+		pub struct ReporterAuthorityId;
+		impl system::offchain::AppCrypto<<ReporterSignature as Verify>::Signer, ReporterSignature> for ReporterAuthorityId {
+			type RuntimeAppPublic = app::Public;
+			type GenericSignature = sr25519::Signature;
+			type GenericPublic = sr25519::Public;
+		}
 	}
 
 	impl Trait for Test {
+		type AuthorityId = test_keys::ReporterAuthorityId;
 		type Origin = Origin;
 		type Call = Call;
 		type ParachainCurrency = Balances;
@@ -1882,25 +1889,19 @@ mod tests {
 		type ReportOffence = Offences;
 		type BlockHashConversion = sp_runtime::traits::Identity;
 		type KeyOwnerProofSystem = Historical;
-		type SubmitSignedTransaction = system::offchain::TransactionSubmitter<
-			test_keys::ReporterId,
-			Test,
-			Extrinsic,
-		>;
 	}
 
 	type Extrinsic = TestXt<Call, ()>;
 
-	impl system::offchain::CreateTransaction<Test, Extrinsic> for Test {
-		type Public = test_keys::ReporterId;
-		type Signature = test_keys::ReporterSignature;
-
-		fn create_transaction<F: system::offchain::Signer<Self::Public, Self::Signature>>(
-			call: <Extrinsic as ExtrinsicT>::Call,
-			_public: Self::Public,
-			_account: <Test as system::Trait>::AccountId,
-			nonce: <Test as system::Trait>::Index,
-		) -> Option<(<Extrinsic as ExtrinsicT>::Call, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
+	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+		Call: From<LocalCall>,
+	{
+		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+			call: Call,
+			_public: <Signature as Verify>::Signer,
+			_account: AccountId,
+			_nonce: <Runtime as system::Trait>::Index,
+		) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 			Some((call, (nonce, ())))
 		}
 	}
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index e36d8b5e7cb5..97505b122bb8 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -879,9 +879,16 @@ mod tests {
 
 		pub type ReporterId = app::Public;
 		pub type ReporterSignature = app::Signature;
+		pub struct ReporterAuthorityId;
+		impl system::offchain::AppCrypto<<ReporterSignature as Verify>::Signer, ReporterSignature> for ReporterAuthorityId {
+			type RuntimeAppPublic = app::Public;
+			type GenericSignature = sr25519::Signature;
+			type GenericPublic = sr25519::Public;
+		}
 	}
 
 	impl parachains::Trait for Test {
+		type AuthorityId = test_keys::ReporterAuthorityId;
 		type Origin = Origin;
 		type Call = Call;
 		type ParachainCurrency = balances::Module<Test>;
@@ -899,25 +906,19 @@ mod tests {
 		type IdentificationTuple = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, Vec<u8>)>>::IdentificationTuple;
 		type ReportOffence = ();
 		type BlockHashConversion = sp_runtime::traits::Identity;
-		type SubmitSignedTransaction = system::offchain::TransactionSubmitter<
-			test_keys::ReporterId,
-			Test,
-			Extrinsic,
-		>;
 	}
 
 	type Extrinsic = TestXt<Call, ()>;
 
-	impl system::offchain::CreateTransaction<Test, Extrinsic> for Test {
-		type Public = test_keys::ReporterId;
-		type Signature = test_keys::ReporterSignature;
-
-		fn create_transaction<F: system::offchain::Signer<Self::Public, Self::Signature>>(
-			call: <Extrinsic as ExtrinsicT>::Call,
-			_public: Self::Public,
-			_account: <Test as system::Trait>::AccountId,
-			nonce: <Test as system::Trait>::Index,
-		) -> Option<(<Extrinsic as ExtrinsicT>::Call, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
+	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+		Call: From<LocalCall>,
+	{
+		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+			call: Call,
+			_public: <Signature as Verify>::Signer,
+			_account: AccountId,
+			_nonce: <Runtime as system::Trait>::Index,
+		) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 			Some((call, (nonce, ())))
 		}
 	}
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 88026ccb7e93..0f49632ef06c 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -56,7 +56,6 @@ use frame_support::{
 };
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::historical as session_historical;
-use system::offchain::TransactionSubmitter;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -335,6 +334,7 @@ parameter_types! {
 }
 
 impl parachains::Trait for Runtime {
+	type AuthorityId = FishermanAuthorityId;
 	type Origin = Origin;
 	type Call = Call;
 	type ParachainCurrency = Balances;
@@ -356,17 +356,22 @@ impl parachains::Trait for Runtime {
 		>::IdentificationTuple;
 	type ReportOffence = Offences;
 	type BlockHashConversion = sp_runtime::traits::Identity;
-	type SubmitSignedTransaction = TransactionSubmitter<parachain::FishermanId, Runtime, UncheckedExtrinsic>;
 }
 
-impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtime {
-	type Public = <primitives::Signature as sp_runtime::traits::Verify>::Signer;
-	type Signature = primitives::Signature;
+pub struct FishermanAuthorityId;
+impl system::offchain::AppCrypto<<Signature as Verify>::Signer, Signature> for FishermanAuthorityId {
+	type RuntimeAppPublic = parachain::FishermanId;
+	type GenericSignature = sr25519::Signature;
+	type GenericPublic = sr25519::Public;
+}
 
-	fn create_transaction<TSigner: system::offchain::Signer<Self::Public, Self::Signature>>(
-		call: <UncheckedExtrinsic as ExtrinsicT>::Call,
-		public: Self::Public,
-		account: <Runtime as system::Trait>::AccountId,
+impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	Call: From<LocalCall>,
+{
+	fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
+		call: Call,
+		public: <Signature as Verify>::Signer,
+		account: AccountId,
 		nonce: <Runtime as system::Trait>::Index,
 	) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
 		let period = BlockHashCount::get()
@@ -390,12 +395,13 @@ impl system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for Runtim
 			parachains::ValidateDoubleVoteReports::<Runtime>::new(),
 		);
 		let raw_payload = SignedPayload::new(call, extra).map_err(|e| {
-			debug::warn!("Unable to create signed payload: {:?}", e)
+			debug::warn!("Unable to create signed payload: {:?}", e);
 		}).ok()?;
-		let signature = TSigner::sign(public, &raw_payload)?;
+		let signature = raw_payload.using_encoded(|payload| {
+			C::sign(payload, public)
+		})?;
 		let (call, extra, _) = raw_payload.deconstruct();
-		let address = Indices::unlookup(account);
-		Some((call, (address, signature, extra)))
+		Some((call, (account, signature, extra)))
 	}
 }
 

From 9a426ff2be7a2475913da20f7395a9c4d13accea Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 12:37:15 +0200
Subject: [PATCH 11/17] Implement CreateSignedtransaction for Test

---
 runtime/common/src/parachains.rs | 2 +-
 runtime/common/src/registrar.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 92c2542244cd..1015c303b523 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1893,7 +1893,7 @@ mod tests {
 
 	type Extrinsic = TestXt<Call, ()>;
 
-	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Test where
 		Call: From<LocalCall>,
 	{
 		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index 97505b122bb8..02d6d4c41fbb 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -910,7 +910,7 @@ mod tests {
 
 	type Extrinsic = TestXt<Call, ()>;
 
-	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
+	impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Test where
 		Call: From<LocalCall>,
 	{
 		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(

From b11d2c943f74cc64d338fa76cbbbd271382cb343 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 12:44:31 +0200
Subject: [PATCH 12/17] Implement signing types for test runtimes

---
 runtime/common/src/parachains.rs | 5 +++++
 runtime/common/src/registrar.rs  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 1015c303b523..83054711d36e 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1906,6 +1906,11 @@ mod tests {
 		}
 	}
 
+	impl system::offchain::SigningTypes for Test {
+		type Public = <Signature as Verify>::Signer;
+		type Signature = Signature;
+	}
+
 	type Parachains = Module<Test>;
 	type Balances = balances::Module<Test>;
 	type System = system::Module<Test>;
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index 02d6d4c41fbb..69227dc66771 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -923,6 +923,11 @@ mod tests {
 		}
 	}
 
+	impl system::offchain::SigningTypes for Test {
+		type Public = <Signature as Verify>::Signer;
+		type Signature = Signature;
+	}
+
 	parameter_types! {
 		pub const ParathreadDeposit: Balance = 10;
 		pub const QueueSize: usize = 2;

From 9290daa191234bcc1a2f2f2bac54740c5ad1bd11 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 12:58:33 +0200
Subject: [PATCH 13/17] Fix test runtime create transaction impl

---
 runtime/test-runtime/src/lib.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 0f49632ef06c..4dd88a078391 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -31,7 +31,7 @@ use runtime_common::{attestations, claims, parachains, registrar, slots,
 	BlockHashCount, MaximumBlockWeight, AvailableBlockRatio,
 	MaximumBlockLength,
 };
-
+use sp_core::sr25519;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	ApplyExtrinsicResult, Perbill, Perquintill, RuntimeDebug, KeyTypeId,
@@ -41,7 +41,7 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	traits::{
 		BlakeTwo256, Block as BlockT, StaticLookup, SignedExtension, OpaqueKeys, ConvertInto,
-		DispatchInfoOf, Extrinsic as ExtrinsicT, SaturatedConversion,
+		DispatchInfoOf, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
 	},
 };
 use version::RuntimeVersion;
@@ -401,10 +401,16 @@ impl<LocalCall> system::offchain::CreateSignedTransaction<LocalCall> for Runtime
 			C::sign(payload, public)
 		})?;
 		let (call, extra, _) = raw_payload.deconstruct();
-		Some((call, (account, signature, extra)))
+		let address = Indices::unlookup(account);
+		Some((call, (address, signature, extra)))
 	}
 }
 
+impl system::offchain::SigningTypes for Runtime {
+	type Public = <Signature as Verify>::Signer;
+	type Signature = Signature;
+}
+
 impl offences::Trait for Runtime {
 	type Event = Event;
 	type IdentificationTuple = session::historical::IdentificationTuple<Self>;

From e006096d765deceff99407eca113964ec37940b2 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 13:48:09 +0200
Subject: [PATCH 14/17] Fix build

---
 runtime/common/src/parachains.rs | 22 ++++++++++------------
 runtime/common/src/registrar.rs  | 20 ++++++++++----------
 runtime/westend/src/lib.rs       |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 83054711d36e..1025fb7acc53 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -1559,7 +1559,7 @@ mod tests {
 	use super::Call as ParachainsCall;
 	use bitvec::{bitvec, vec::BitVec};
 	use sp_io::TestExternalities;
-	use sp_core::{H256, Blake2Hasher};
+	use sp_core::{H256, Blake2Hasher, sr25519};
 	use sp_trie::NodeCodec;
 	use sp_runtime::{
 		impl_opaque_keys,
@@ -1839,8 +1839,7 @@ mod tests {
 
 	// This is needed for a custom `AccountId` type which is `u64` in testing here.
 	pub mod test_keys {
-		use sp_core::crypto::KeyTypeId;
-
+		use sp_core::{crypto::KeyTypeId, sr25519};
 		pub const KEY_TYPE: KeyTypeId = KeyTypeId(*b"test");
 
 		mod app {
@@ -1859,10 +1858,9 @@ mod tests {
 		}
 
 		pub type ReporterId = app::Public;
-		pub type ReporterSignature = app::Signature;
 		pub struct ReporterAuthorityId;
-		impl system::offchain::AppCrypto<<ReporterSignature as Verify>::Signer, ReporterSignature> for ReporterAuthorityId {
-			type RuntimeAppPublic = app::Public;
+		impl system::offchain::AppCrypto<ReporterId, sr25519::Signature> for ReporterAuthorityId {
+			type RuntimeAppPublic = ReporterId;
 			type GenericSignature = sr25519::Signature;
 			type GenericPublic = sr25519::Public;
 		}
@@ -1898,17 +1896,17 @@ mod tests {
 	{
 		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
 			call: Call,
-			_public: <Signature as Verify>::Signer,
-			_account: AccountId,
-			_nonce: <Runtime as system::Trait>::Index,
-		) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
+			_public: test_keys::ReporterId,
+			_account: <Test as system::Trait>::AccountId,
+			nonce: <Test as system::Trait>::Index,
+		) -> Option<(Call, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
 			Some((call, (nonce, ())))
 		}
 	}
 
 	impl system::offchain::SigningTypes for Test {
-		type Public = <Signature as Verify>::Signer;
-		type Signature = Signature;
+		type Public = test_keys::ReporterId;
+		type Signature = sr25519::Signature;
 	}
 
 	type Parachains = Module<Test>;
diff --git a/runtime/common/src/registrar.rs b/runtime/common/src/registrar.rs
index 69227dc66771..8867e72842c8 100644
--- a/runtime/common/src/registrar.rs
+++ b/runtime/common/src/registrar.rs
@@ -676,7 +676,7 @@ mod tests {
 			CandidateReceipt, HeadData, ValidityAttestation, Statement, Chain,
 			CollatorPair, CandidateCommitments,
 		},
-		Balance, BlockNumber, Header,
+		Balance, BlockNumber, Header, Signature,
 	};
 	use frame_support::{
 		traits::{KeyOwnerProofSystem, OnInitialize, OnFinalize},
@@ -857,7 +857,8 @@ mod tests {
 
 	// This is needed for a custom `AccountId` type which is `u64` in testing here.
 	pub mod test_keys {
-		use sp_core::crypto::KeyTypeId;
+		use sp_core::{crypto::KeyTypeId, sr25519};
+		use primitives::Signature;
 
 		pub const KEY_TYPE: KeyTypeId = KeyTypeId(*b"test");
 
@@ -878,10 +879,9 @@ mod tests {
 		}
 
 		pub type ReporterId = app::Public;
-		pub type ReporterSignature = app::Signature;
 		pub struct ReporterAuthorityId;
-		impl system::offchain::AppCrypto<<ReporterSignature as Verify>::Signer, ReporterSignature> for ReporterAuthorityId {
-			type RuntimeAppPublic = app::Public;
+		impl system::offchain::AppCrypto<ReporterId, Signature> for ReporterAuthorityId {
+			type RuntimeAppPublic = ReporterId;
 			type GenericSignature = sr25519::Signature;
 			type GenericPublic = sr25519::Public;
 		}
@@ -915,16 +915,16 @@ mod tests {
 	{
 		fn create_transaction<C: system::offchain::AppCrypto<Self::Public, Self::Signature>>(
 			call: Call,
-			_public: <Signature as Verify>::Signer,
-			_account: AccountId,
-			_nonce: <Runtime as system::Trait>::Index,
-		) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
+			_public: test_keys::ReporterId,
+			_account: <Test as system::Trait>::AccountId,
+			nonce: <Test as system::Trait>::Index,
+		) -> Option<(Call, <Extrinsic as ExtrinsicT>::SignaturePayload)> {
 			Some((call, (nonce, ())))
 		}
 	}
 
 	impl system::offchain::SigningTypes for Test {
-		type Public = <Signature as Verify>::Signer;
+		type Public = test_keys::ReporterId;
 		type Signature = Signature;
 	}
 
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index e45108490fe3..cbab496abbc3 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -59,7 +59,7 @@ use frame_support::{
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-use session::{historical as session_historical};
+use session::historical as session_historical;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;

From f29c42c221bcb2a317f20415ebe01b95303ef1e3 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 15:04:40 +0200
Subject: [PATCH 15/17] Bump kusama's spec version

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

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 66fe24819cd5..ab8e0b6c76ba 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -84,7 +84,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kusama"),
 	impl_name: create_runtime_str!("parity-kusama"),
 	authoring_version: 2,
-	spec_version: 1059,
+	spec_version: 1060,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

From 1ec7a4e54f96859f347f87e90c5bb84095638f5d Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 15:22:54 +0200
Subject: [PATCH 16/17] Update substrate

---
 Cargo.lock | 252 ++++++++++++++++++++++++++---------------------------
 1 file changed, 126 insertions(+), 126 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d82a0222450..940d6a7d07e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1227,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1252,7 +1252,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1271,7 +1271,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1286,7 +1286,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1297,7 +1297,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1321,7 +1321,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.10",
@@ -1332,7 +1332,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1344,7 +1344,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -1354,7 +1354,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1370,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3252,7 +3252,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3270,7 +3270,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3287,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3308,7 +3308,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3323,7 +3323,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3339,7 +3339,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3354,7 +3354,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3368,7 +3368,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3384,7 +3384,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3402,7 +3402,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3418,7 +3418,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3437,7 +3437,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3453,7 +3453,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3467,7 +3467,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3481,7 +3481,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3496,7 +3496,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3509,7 +3509,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3524,7 +3524,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3539,7 +3539,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3557,7 +3557,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3572,7 +3572,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3593,7 +3593,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -3604,7 +3604,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3618,7 +3618,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3635,7 +3635,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3648,7 +3648,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3666,7 +3666,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3679,7 +3679,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3693,7 +3693,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3708,7 +3708,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5219,7 +5219,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.5",
@@ -5246,7 +5246,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5262,7 +5262,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5278,7 +5278,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -5289,7 +5289,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "ansi_term 0.12.1",
  "app_dirs",
@@ -5331,7 +5331,7 @@ dependencies = [
 [[package]]
 name = "sc-client"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5368,7 +5368,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5402,7 +5402,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5432,7 +5432,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "fork-tree",
@@ -5474,7 +5474,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5487,7 +5487,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5508,7 +5508,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -5522,7 +5522,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "lazy_static",
@@ -5550,7 +5550,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -5567,7 +5567,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5582,7 +5582,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -5603,7 +5603,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "assert_matches",
  "finality-grandpa",
@@ -5639,7 +5639,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.4",
@@ -5656,7 +5656,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "hex",
@@ -5671,7 +5671,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "bitflags",
  "bytes 0.5.4",
@@ -5723,7 +5723,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5739,7 +5739,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "env_logger 0.7.1",
  "futures 0.3.4",
@@ -5765,7 +5765,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -5792,7 +5792,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "libp2p",
@@ -5805,7 +5805,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -5838,7 +5838,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -5862,7 +5862,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5877,7 +5877,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "exit-future",
@@ -5928,7 +5928,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5942,7 +5942,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.4",
@@ -5964,7 +5964,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -5979,7 +5979,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -5999,7 +5999,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6384,7 +6384,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6396,7 +6396,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6411,7 +6411,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6423,7 +6423,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6435,7 +6435,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.11",
@@ -6449,7 +6449,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6461,7 +6461,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6472,7 +6472,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6484,7 +6484,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6500,7 +6500,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "serde",
  "serde_json",
@@ -6509,7 +6509,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6532,7 +6532,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6546,7 +6546,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6562,7 +6562,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6574,7 +6574,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6615,7 +6615,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -6624,7 +6624,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -6634,7 +6634,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "environmental",
  "sp-std",
@@ -6644,7 +6644,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6657,7 +6657,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6667,7 +6667,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "parity-scale-codec",
@@ -6679,7 +6679,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -6699,7 +6699,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6710,7 +6710,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -6719,7 +6719,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -6728,7 +6728,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6740,7 +6740,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen-compact"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -6751,7 +6751,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "serde",
  "sp-core",
@@ -6760,7 +6760,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -6781,7 +6781,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6796,7 +6796,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6808,7 +6808,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "serde",
  "serde_json",
@@ -6817,7 +6817,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6828,7 +6828,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6838,7 +6838,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "hash-db",
  "log 0.4.8",
@@ -6857,12 +6857,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -6874,7 +6874,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6888,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "tracing",
 ]
@@ -6896,7 +6896,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6911,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "futures-core",
@@ -6936,7 +6936,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -6948,7 +6948,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7076,7 +7076,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7103,7 +7103,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "platforms",
 ]
@@ -7111,7 +7111,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.4",
@@ -7132,7 +7132,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "async-std",
  "derive_more 0.99.5",
@@ -7146,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -7166,7 +7166,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7205,7 +7205,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 dependencies = [
  "futures 0.3.4",
  "parity-scale-codec",
@@ -7223,7 +7223,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.5"
-source = "git+https://github.com/paritytech/substrate#fc6e2a625d807509605c8e790ba3f5136236aa12"
+source = "git+https://github.com/paritytech/substrate#b20dc82aedd47538a1f17ff125d58fe4f12e2b7c"
 
 [[package]]
 name = "substrate-wasm-builder-runner"

From 3ffa61e4f9584eab503884503d81e03b77bc795c Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan@parity.io>
Date: Tue, 21 Apr 2020 18:29:10 +0200
Subject: [PATCH 17/17] Use all_accounts

---
 runtime/common/src/parachains.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
index 1025fb7acc53..631f8d34ce49 100644
--- a/runtime/common/src/parachains.rs
+++ b/runtime/common/src/parachains.rs
@@ -813,12 +813,13 @@ impl<T: Trait> Module<T> {
 	pub fn submit_double_vote_report(
 		report: DoubleVoteReport<T::Proof>,
 	) -> Option<()> {
-		Signer::<T, T::AuthorityId>::any_account()
+		Signer::<T, T::AuthorityId>::all_accounts()
 			.send_signed_transaction(
 				move |_account| {
 					Call::report_double_vote(report.clone())
 				}
-			).map(|_| ())
+			);
+		return Some(())
 	}
 
 	/// Dispatch some messages from a parachain.