Construct Runtime v2

prdoc/pr_1378.prdoc

@@ -0,0 +1,27 @@
+title: Construct Runtime V2 - An outer macro approach to define the runtime
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Introduces `#[frame_support::runtime]` that can be attached to a mod to define a runtime. The items 
+      in this mod can be attached to the following attributes to define the key components of the runtime.
+      1. `#[runtime::runtime]` attached to a struct defines the main runtime
+      2. `#[runtime::derive]` attached to this struct defines the types generated by the runtime
+      3. `#[runtime::pallet_index]` must be attached to a pallet to define its index
+      4. `#[runtime::disable_call]` can be optionally attached to a pallet to disable its calls
+      5. `#[runtime::disable_unsigned]` can be optionally attached to a pallet to disable unsigned calls
+      6. A pallet instance can be defined as `TemplateModule: pallet_template<Instance>`
+      An optional attribute can be defined as `#[frame_support::runtime(legacy_ordering)]` to ensure that 
+      the order of hooks is same as the order of pallets (and not based on the pallet_index). This is to support 
+      legacy runtimes and should be avoided for new ones.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates:
+  - name: frame-support
+  - name: frame-support-procedural
+
+host_functions: []

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

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