Grand Central Dispatch

bin/node-template/pallets/template/src/mock.rs

@@ -42,6 +42,7 @@ impl system::Trait for Test {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 impl Trait for Test {
 	type Event = ();

bin/node-template/runtime/src/lib.rs

@@ -167,6 +167,8 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 	/// The data to be stored in an account.
 	type AccountData = balances::AccountData<Balance>;
+	// This is the central place where all calls are dispatched from.
+	type RootDispatcher = system::Module<Self>;
 }
 
 impl aura::Trait for Runtime {
@@ -219,6 +221,7 @@ impl transaction_payment::Trait for Runtime {
 impl sudo::Trait for Runtime {
 	type Event = Event;
 	type Call = Call;
+	type Dispatcher = <Self as system::Trait>::RootDispatcher;
 }
 
 /// Used for the module template in `./template.rs`

bin/node/runtime/src/lib.rs

@@ -143,6 +143,7 @@ impl frame_system::Trait for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = frame_system::Module<Self>;
 }
 
 parameter_types! {
@@ -160,6 +161,7 @@ impl pallet_utility::Trait for Runtime {
 	type MultisigDepositBase = MultisigDepositBase;
 	type MultisigDepositFactor = MultisigDepositFactor;
 	type MaxSignatories = MaxSignatories;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 parameter_types! {
@@ -341,6 +343,7 @@ impl pallet_democracy::Trait for Runtime {
 	type CooloffPeriod = CooloffPeriod;
 	type PreimageByteDeposit = PreimageByteDeposit;
 	type Slash = Treasury;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 parameter_types! {
@@ -353,6 +356,7 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {
 	type Proposal = Call;
 	type Event = Event;
 	type MotionDuration = CouncilMotionDuration;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 parameter_types! {
@@ -388,6 +392,7 @@ impl pallet_collective::Trait<TechnicalCollective> for Runtime {
 	type Proposal = Call;
 	type Event = Event;
 	type MotionDuration = TechnicalMotionDuration;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 impl pallet_membership::Trait<pallet_membership::Instance1> for Runtime {
@@ -447,6 +452,7 @@ impl pallet_contracts::Trait for Runtime {
 	type Event = Event;
 	type DetermineContractAddress = pallet_contracts::SimpleAddressDeterminer<Runtime>;
 	type ComputeDispatchFee = pallet_contracts::DefaultDispatchFeeComputor<Runtime>;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 	type TrieIdGenerator = pallet_contracts::TrieIdFromParentCounter<Runtime>;
 	type GasPayment = ();
 	type RentPayment = ();
@@ -469,6 +475,7 @@ impl pallet_contracts::Trait for Runtime {
 impl pallet_sudo::Trait for Runtime {
 	type Event = Event;
 	type Call = Call;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 /// A runtime transaction submitter.
@@ -586,6 +593,7 @@ impl pallet_recovery::Trait for Runtime {
 	type FriendDepositFactor = FriendDepositFactor;
 	type MaxFriends = MaxFriends;
 	type RecoveryDeposit = RecoveryDeposit;
+	type Dispatcher = <Self as frame_system::Trait>::RootDispatcher;
 }
 
 parameter_types! {

frame/assets/src/lib.rs

@@ -296,6 +296,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 	impl Trait for Test {
 		type Event = ();

frame/aura/src/mock.rs

@@ -64,6 +64,7 @@ impl frame_system::Trait for Test {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 
 impl pallet_timestamp::Trait for Test {

frame/authority-discovery/src/lib.rs

@@ -160,6 +160,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 
 	impl_outer_origin! {

frame/authorship/src/lib.rs

@@ -434,6 +434,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 
 	parameter_types! {

frame/babe/src/mock.rs

@@ -67,6 +67,7 @@ impl frame_system::Trait for Test {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 
 impl_opaque_keys! {

frame/balances/src/lib.rs

@@ -853,6 +853,7 @@ impl<T: Subtrait<I>, I: Instance> frame_system::Trait for ElevatedTrait<T, I> {
 	type OnNewAccount = T::OnNewAccount;
 	type OnKilledAccount = T::OnKilledAccount;
 	type AccountData = T::AccountData;
+	type RootDispatcher = ();
 }
 impl<T: Subtrait<I>, I: Instance> Trait<I> for ElevatedTrait<T, I> {
 	type Balance = T::Balance;

frame/balances/src/tests_composite.rs

@@ -68,6 +68,7 @@ impl frame_system::Trait for Test {
 	type AccountData = super::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 parameter_types! {
 	pub const TransactionBaseFee: u64 = 0;

frame/balances/src/tests_local.rs

@@ -68,6 +68,7 @@ impl frame_system::Trait for Test {
 	type AccountData = super::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = Module<Test>;
+	type RootDispatcher = ();
 }
 parameter_types! {
 	pub const TransactionBaseFee: u64 = 0;

frame/benchmarking/src/lib.rs

@@ -23,7 +23,7 @@ mod utils;
 pub use utils::*;
 #[doc(hidden)]
 pub use sp_io::storage::root as storage_root;
-pub use sp_runtime::traits::Dispatchable;
+pub use sp_runtime::{SimpleDispatcher, traits::{Dispatchable, Dispatcher}};
 
 /// Construct pallet benchmarks for weighing dispatchables.
 ///
@@ -158,7 +158,7 @@ macro_rules! benchmarks_iter {
 	) => {
 		$crate::benchmarks_iter! {
 			{ $( $common )* } ( $( $names )* ) $name { $( $code )* }: { 
-				<Call<T> as $crate::Dispatchable>::dispatch(Call::<T>::$dispatch($($arg),*), $origin.into())?;
+				<$crate::SimpleDispatcher as $crate::Dispatcher<_, _>>::dispatch(Call::<T>::$dispatch($($arg),*), $origin.into()).result?;
 			} $( $rest )*
 		}
 	};

frame/benchmarking/src/tests.rs

@@ -73,6 +73,7 @@ impl frame_system::Trait for Test {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 
 impl Trait for Test {

frame/collective/src/lib.rs

@@ -39,7 +39,7 @@
 use sp_std::{prelude::*, result};
 use sp_core::u32_trait::Value as U32;
 use sp_runtime::RuntimeDebug;
-use sp_runtime::traits::{Hash, EnsureOrigin};
+use sp_runtime::traits::{Hash, EnsureOrigin, Dispatcher};
 use frame_support::weights::SimpleDispatchInfo;
 use frame_support::{
 	dispatch::{Dispatchable, Parameter}, codec::{Encode, Decode},
@@ -69,6 +69,9 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 
 	/// The time-out for council motions.
 	type MotionDuration: Get<Self::BlockNumber>;
+
+    /// The means of dispatching the calls to the runtime.
+	type Dispatcher: Dispatcher<<Self as Trait<I>>::Proposal, <Self as Trait<I>>::Origin>;
 }
 
 /// Origin for the collective module.
@@ -203,7 +206,7 @@ decl_module! {
 			ensure!(Self::is_member(&who), Error::<T, I>::NotMember);
 
 			let proposal_hash = T::Hashing::hash_of(&proposal);
-			let ok = proposal.dispatch(RawOrigin::Member(who).into()).is_ok();
+			let ok = T::Dispatcher::dispatch(*proposal, RawOrigin::Member(who).into()).is_ok();
 			Self::deposit_event(RawEvent::MemberExecuted(proposal_hash, ok));
 		}
 
@@ -222,7 +225,7 @@ decl_module! {
 
 			if threshold < 2 {
 				let seats = Self::members().len() as MemberCount;
-				let ok = proposal.dispatch(RawOrigin::Members(1, seats).into()).is_ok();
+				let ok = T::Dispatcher::dispatch(*proposal, RawOrigin::Members(1, seats).into()).is_ok();
 				Self::deposit_event(RawEvent::Executed(proposal_hash, ok));
 			} else {
 				let index = Self::proposal_count();
@@ -360,7 +363,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 			// execute motion, assuming it exists.
 			if let Some(p) = ProposalOf::<T, I>::take(&proposal) {
 				let origin = RawOrigin::Members(voting.threshold, seats).into();
-				let ok = p.dispatch(origin).is_ok();
+				let ok = T::Dispatcher::dispatch(p, origin).is_ok();
 				Self::deposit_event(RawEvent::Executed(proposal, ok));
 			}
 		} else {
@@ -537,18 +540,21 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 	impl Trait<Instance1> for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
 		type MotionDuration = MotionDuration;
+		type Dispatcher = sp_runtime::SimpleDispatcher;
 	}
 	impl Trait for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
 		type MotionDuration = MotionDuration;
+		type Dispatcher = sp_runtime::SimpleDispatcher;
 	}
 
 	pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;

frame/contracts/src/lib.rs

@@ -113,7 +113,9 @@ use sp_std::{prelude::*, marker::PhantomData, fmt::Debug};
 use codec::{Codec, Encode, Decode};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{
-	traits::{Hash, StaticLookup, Zero, MaybeSerializeDeserialize, Member, SignedExtension},
+	traits::{
+		Hash, StaticLookup, Zero, MaybeSerializeDeserialize, Member, SignedExtension, Dispatcher,
+	},
 	transaction_validity::{
 		ValidTransaction, InvalidTransaction, TransactionValidity, TransactionValidityError,
 	},
@@ -366,6 +368,9 @@ pub trait Trait: frame_system::Trait {
 	/// trie id generator
 	type TrieIdGenerator: TrieIdGenerator<Self::AccountId>;
 
+	/// The means of dispatching the calls to the runtime.
+	type Dispatcher: Dispatcher<<Self as Trait>::Call, Self::Origin>;
+
 	/// Handler for the unbalanced reduction when making a gas payment.
 	type GasPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
@@ -763,7 +768,7 @@ impl<T: Trait> Module<T> {
 					origin: who,
 					call,
 				} => {
-					let result = call.dispatch(RawOrigin::Signed(who.clone()).into());
+					let result = T::Dispatcher::dispatch(call, RawOrigin::Signed(who.clone()).into()).result;
 					Self::deposit_event(RawEvent::Dispatched(who, result.is_ok()));
 				}
 				RestoreTo {

frame/contracts/src/tests.rs

@@ -118,6 +118,7 @@ impl frame_system::Trait for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = Contracts;
+	type RootDispatcher = ();
 }
 impl pallet_balances::Trait for Test {
 	type Balance = u64;
@@ -174,6 +175,7 @@ impl Trait for Test {
 	type MaxDepth = MaxDepth;
 	type MaxValueSize = MaxValueSize;
 	type BlockGasLimit = BlockGasLimit;
+	type Dispatcher = sp_runtime::SimpleDispatcher;
 }
 
 type Balances = pallet_balances::Module<Test>;

frame/democracy/src/lib.rs

@@ -165,7 +165,10 @@
 
 use sp_std::prelude::*;
 use sp_runtime::{
-	DispatchResult, DispatchError, traits::{Zero, EnsureOrigin, Hash, Dispatchable, Saturating},
+	DispatchResult, DispatchError, traits::{
+		Zero, EnsureOrigin, Hash, Dispatchable, Dispatcher, Saturating
+	},
+
 };
 use codec::{Ref, Decode};
 use frame_support::{
@@ -270,6 +273,9 @@ pub trait Trait: frame_system::Trait + Sized {
 
 	/// Handler for the unbalanced reduction when slashing a preimage deposit.
 	type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
+
+	/// The means of dispatching the proposals.
+	type Dispatcher: Dispatcher<Self::Proposal, Self::Origin>;
 }
 
 decl_storage! {
@@ -1539,7 +1545,11 @@ impl<T: Trait> Module<T> {
 				let _ = T::Currency::unreserve(&who, amount);
 				Self::deposit_event(RawEvent::PreimageUsed(proposal_hash, who, amount));
 
-				let ok = proposal.dispatch(frame_system::RawOrigin::Root.into()).is_ok();
+				let ok = T::Dispatcher::dispatch(
+					proposal,
+					frame_system::RawOrigin::Root.into()
+				)
+				.is_ok();
 				Self::deposit_event(RawEvent::Executed(index, ok));
 
 				Ok(())
@@ -1663,4 +1673,4 @@ impl<T: Trait> Module<T> {
 		}
 		Ok(())
 	}
-}
+}

frame/democracy/src/tests.rs

@@ -87,6 +87,7 @@ impl frame_system::Trait for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
@@ -152,6 +153,7 @@ impl super::Trait for Test {
 	type Slash = ();
 	type InstantOrigin = EnsureSignedBy<Six, u64>;
 	type InstantAllowed = InstantAllowed;
+	type Dispatcher = sp_runtime::SimpleDispatcher;
 }
 
 fn new_test_ext() -> sp_io::TestExternalities {

frame/elections-phragmen/src/lib.rs

@@ -863,6 +863,7 @@ mod tests {
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 
 	parameter_types! {

frame/elections/src/mock.rs

@@ -57,6 +57,7 @@ impl frame_system::Trait for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 
 parameter_types! {

frame/example-offchain-worker/src/tests.rs

@@ -68,6 +68,7 @@ impl frame_system::Trait for Test {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type RootDispatcher = ();
 }
 
 type Extrinsic = TestXt<Call<Test>, ()>;

frame/example/src/lib.rs

@@ -733,6 +733,7 @@ mod tests {
 		type AccountData = pallet_balances::AccountData<u64>;
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type RootDispatcher = ();
 	}
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;