Construct Runtime v2

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

@@ -279,19 +279,42 @@ impl pallet_template::Config for Runtime {
 }
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
-construct_runtime!(
-	pub struct Runtime {
+#[frame_support::construct_runtime_v2]
+mod runtime {
+	#[frame::runtime]
+	pub struct Runtime;
+
+	#[frame::pallets]
+	#[frame::derive(
+		RuntimeCall,
+		RuntimeEvent,
+		RuntimeError,
+		RuntimeOrigin,
+		RuntimeFreezeReason,
+		RuntimeHoldReason,
+		RuntimeSlashReason,
+		RuntimeLockId
+	)]
+	pub struct Pallets {
+		#[frame::pallet_index(0)]
 		System: frame_system,
+		#[frame::pallet_index(1)]
 		Timestamp: pallet_timestamp,
+		#[frame::pallet_index(2)]
 		Aura: pallet_aura,
+		#[frame::pallet_index(3)]
 		Grandpa: pallet_grandpa,
+		#[frame::pallet_index(4)]
 		Balances: pallet_balances,
+		#[frame::pallet_index(5)]
 		TransactionPayment: pallet_transaction_payment,
+		#[frame::pallet_index(6)]
 		Sudo: pallet_sudo,
 		// Include the custom logic from the pallet-template in the runtime.
+		#[frame::pallet_index(7)]
 		TemplateModule: pallet_template,
 	}
-);
+}
 
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, ()>;

substrate/bin/node/runtime/src/lib.rs

@@ -28,7 +28,6 @@ use frame_election_provider_support::{
 	onchain, BalancingConfig, ElectionDataProvider, SequentialPhragmen, VoteWeight,
 };
 use frame_support::{
-	construct_runtime,
 	dispatch::DispatchClass,
 	instances::{Instance1, Instance2},
 	ord_parameter_types,
@@ -2014,84 +2013,169 @@ impl pallet_broker::Config for Runtime {
 	type PriceAdapter = pallet_broker::Linear;
 }
 
-construct_runtime!(
-	pub struct Runtime
-	{
+#[frame_support::construct_runtime_v2]
+mod runtime {
+	#[frame::runtime]
+	pub struct Runtime;
+
+	#[frame::pallets]
+	#[frame::derive(
+		RuntimeCall,
+		RuntimeEvent,
+		RuntimeError,
+		RuntimeOrigin,
+		RuntimeFreezeReason,
+		RuntimeHoldReason,
+		RuntimeSlashReason,
+		RuntimeLockId
+	)]
+	pub struct Pallets {
+		#[frame::pallet_index(0)]
 		System: frame_system,
+		#[frame::pallet_index(1)]
 		Utility: pallet_utility,
+		#[frame::pallet_index(2)]
 		Babe: pallet_babe,
+		#[frame::pallet_index(3)]
 		Timestamp: pallet_timestamp,
 		// Authorship must be before session in order to note author in the correct session and era
 		// for im-online and staking.
+		#[frame::pallet_index(4)]
 		Authorship: pallet_authorship,
+		#[frame::pallet_index(5)]
 		Indices: pallet_indices,
+		#[frame::pallet_index(6)]
 		Balances: pallet_balances,
+		#[frame::pallet_index(7)]
 		TransactionPayment: pallet_transaction_payment,
+		#[frame::pallet_index(8)]
 		AssetTxPayment: pallet_asset_tx_payment,
+		#[frame::pallet_index(9)]
 		AssetConversionTxPayment: pallet_asset_conversion_tx_payment,
+		#[frame::pallet_index(10)]
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
+		#[frame::pallet_index(11)]
 		Staking: pallet_staking,
+		#[frame::pallet_index(12)]
 		Session: pallet_session,
+		#[frame::pallet_index(13)]
 		Democracy: pallet_democracy,
-		Council: pallet_collective::<Instance1>,
-		TechnicalCommittee: pallet_collective::<Instance2>,
+		#[frame::pallet_index(14)]
+		Council: pallet_collective<Instance1>,
+		#[frame::pallet_index(15)]
+		TechnicalCommittee: pallet_collective<Instance2>,
+		#[frame::pallet_index(16)]
 		Elections: pallet_elections_phragmen,
-		TechnicalMembership: pallet_membership::<Instance1>,
+		#[frame::pallet_index(17)]
+		TechnicalMembership: pallet_membership<Instance1>,
+		#[frame::pallet_index(18)]
 		Grandpa: pallet_grandpa,
+		#[frame::pallet_index(19)]
 		Treasury: pallet_treasury,
+		#[frame::pallet_index(20)]
 		AssetRate: pallet_asset_rate,
+		#[frame::pallet_index(21)]
 		Contracts: pallet_contracts,
+		#[frame::pallet_index(22)]
 		Sudo: pallet_sudo,
+		#[frame::pallet_index(23)]
 		ImOnline: pallet_im_online,
+		#[frame::pallet_index(24)]
 		AuthorityDiscovery: pallet_authority_discovery,
+		#[frame::pallet_index(25)]
 		Offences: pallet_offences,
-		Historical: pallet_session_historical::{Pallet},
+		#[frame::pallet_index(26)]
+		Historical: pallet_session_historical + Pallet,
+		#[frame::pallet_index(27)]
 		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip,
+		#[frame::pallet_index(28)]
 		Identity: pallet_identity,
+		#[frame::pallet_index(29)]
 		Society: pallet_society,
+		#[frame::pallet_index(30)]
 		Recovery: pallet_recovery,
+		#[frame::pallet_index(31)]
 		Vesting: pallet_vesting,
+		#[frame::pallet_index(32)]
 		Scheduler: pallet_scheduler,
+		#[frame::pallet_index(33)]
 		Glutton: pallet_glutton,
+		#[frame::pallet_index(34)]
 		Preimage: pallet_preimage,
+		#[frame::pallet_index(35)]
 		Proxy: pallet_proxy,
+		#[frame::pallet_index(36)]
 		Multisig: pallet_multisig,
+		#[frame::pallet_index(37)]
 		Bounties: pallet_bounties,
+		#[frame::pallet_index(38)]
 		Tips: pallet_tips,
-		Assets: pallet_assets::<Instance1>,
-		PoolAssets: pallet_assets::<Instance2>,
+		#[frame::pallet_index(39)]
+		Assets: pallet_assets<Instance1>,
+		#[frame::pallet_index(40)]
+		PoolAssets: pallet_assets<Instance2>,
+		#[frame::pallet_index(41)]
 		Mmr: pallet_mmr,
+		#[frame::pallet_index(42)]
 		Lottery: pallet_lottery,
+		#[frame::pallet_index(43)]
 		Nis: pallet_nis,
+		#[frame::pallet_index(44)]
 		Uniques: pallet_uniques,
+		#[frame::pallet_index(45)]
 		Nfts: pallet_nfts,
+		#[frame::pallet_index(46)]
 		NftFractionalization: pallet_nft_fractionalization,
+		#[frame::pallet_index(47)]
 		Salary: pallet_salary,
+		#[frame::pallet_index(48)]
 		CoreFellowship: pallet_core_fellowship,
+		#[frame::pallet_index(49)]
 		TransactionStorage: pallet_transaction_storage,
-		VoterList: pallet_bags_list::<Instance1>,
+		#[frame::pallet_index(50)]
+		VoterList: pallet_bags_list<Instance1>,
+		#[frame::pallet_index(51)]
 		StateTrieMigration: pallet_state_trie_migration,
+		#[frame::pallet_index(52)]
 		ChildBounties: pallet_child_bounties,
+		#[frame::pallet_index(53)]
 		Referenda: pallet_referenda,
+		#[frame::pallet_index(54)]
 		Remark: pallet_remark,
+		#[frame::pallet_index(55)]
 		RootTesting: pallet_root_testing,
+		#[frame::pallet_index(56)]
 		ConvictionVoting: pallet_conviction_voting,
+		#[frame::pallet_index(57)]
 		Whitelist: pallet_whitelist,
-		AllianceMotion: pallet_collective::<Instance3>,
+		#[frame::pallet_index(58)]
+		AllianceMotion: pallet_collective<Instance3>,
+		#[frame::pallet_index(59)]
 		Alliance: pallet_alliance,
+		#[frame::pallet_index(60)]
 		NominationPools: pallet_nomination_pools,
-		RankedPolls: pallet_referenda::<Instance2>,
+		#[frame::pallet_index(61)]
+		RankedPolls: pallet_referenda<Instance2>,
+		#[frame::pallet_index(62)]
 		RankedCollective: pallet_ranked_collective,
+		#[frame::pallet_index(63)]
 		AssetConversion: pallet_asset_conversion,
+		#[frame::pallet_index(64)]
 		FastUnstake: pallet_fast_unstake,
+		#[frame::pallet_index(65)]
 		MessageQueue: pallet_message_queue,
+		#[frame::pallet_index(66)]
 		Pov: frame_benchmarking_pallet_pov,
+		#[frame::pallet_index(67)]
 		TxPause: pallet_tx_pause,
+		#[frame::pallet_index(68)]
 		SafeMode: pallet_safe_mode,
+		#[frame::pallet_index(69)]
 		Statement: pallet_statement,
+		#[frame::pallet_index(70)]
 		Broker: pallet_broker,
 	}
-);
+}
 
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, AccountIndex>;

substrate/frame/support/procedural/src/construct_runtime/mod.rs

@@ -208,8 +208,8 @@
 //! This macro returns the ` :: expanded { Error }` list of additional parts we would like to
 //! expose.
 
-mod expand;
-mod parse;
+pub(crate) mod expand;
+pub(crate) mod parse;
 
 use cfg_expr::Predicate;
 use frame_support_procedural_tools::{
@@ -496,7 +496,7 @@ fn construct_runtime_final_expansion(
 	Ok(res)
 }
 
-fn decl_all_pallets<'a>(
+pub(crate) fn decl_all_pallets<'a>(
 	runtime: &'a Ident,
 	pallet_declarations: impl Iterator<Item = &'a Pallet>,
 	features: &HashSet<&str>,
@@ -660,7 +660,7 @@ fn decl_all_pallets<'a>(
 	)
 }
 
-fn decl_pallet_runtime_setup(
+pub(crate) fn decl_pallet_runtime_setup(
 	runtime: &Ident,
 	pallet_declarations: &[Pallet],
 	scrate: &TokenStream2,
@@ -752,7 +752,7 @@ fn decl_pallet_runtime_setup(
 	)
 }
 
-fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
+pub(crate) fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
 	quote!(
 		#[cfg(test)]
 		mod __construct_runtime_integrity_test {
@@ -767,7 +767,7 @@ fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
 	)
 }
 
-fn decl_static_assertions(
+pub(crate) fn decl_static_assertions(
 	runtime: &Ident,
 	pallet_decls: &[Pallet],
 	scrate: &TokenStream2,
@@ -798,7 +798,7 @@ fn decl_static_assertions(
 	}
 }
 
-fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> {
+pub(crate) fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> {
 	let max_pallet_num = {
 		if cfg!(feature = "tuples-96") {
 			96