From 9d165a61c067256aa627c28a376e26d8c4f39ba6 Mon Sep 17 00:00:00 2001
From: Robert Hambrock <roberthambrock@gmail.com>
Date: Tue, 30 Jan 2024 15:39:13 +0100
Subject: [PATCH] revert paritytech/polkadot#6577 & related changes (#3108)

Moves `pallet_mmr` back behind `pallet_session` to address
polkadot-fellows/runtimes#160.

Opening draft for CI - should be merged or closed depending on outcome
of w3f/polkadot-spec#718.

---------

Co-authored-by: Adrian Catangiu <adrian@parity.io>
---
 polkadot/runtime/rococo/src/lib.rs  | 14 +++++++-------
 polkadot/runtime/westend/src/lib.rs | 14 +++++++-------
 prdoc/pr_3108.prdoc                 | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 prdoc/pr_3108.prdoc

diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 69261b2b03f38..7a39cb082f4bf 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -1331,13 +1331,6 @@ construct_runtime! {
 		Offences: pallet_offences = 7,
 		Historical: session_historical = 34,
 
-		// BEEFY Bridges support.
-		Beefy: pallet_beefy = 240,
-		// MMR leaf construction must be before session in order to have leaf contents
-		// refer to block<N-1> consistently. see substrate issue #11797 for details.
-		Mmr: pallet_mmr = 241,
-		MmrLeaf: pallet_beefy_mmr = 242,
-
 		Session: pallet_session = 8,
 		Grandpa: pallet_grandpa = 10,
 		AuthorityDiscovery: pallet_authority_discovery = 12,
@@ -1423,6 +1416,13 @@ construct_runtime! {
 		// Pallet for sending XCM.
 		XcmPallet: pallet_xcm = 99,
 
+		// BEEFY Bridges support.
+		Beefy: pallet_beefy = 240,
+		// MMR leaf construction must be after session in order to have a leaf's next_auth_set
+		// refer to block<N>. See issue polkadot-fellows/runtimes#160 for details.
+		Mmr: pallet_mmr = 241,
+		MmrLeaf: pallet_beefy_mmr = 242,
+
 		// Pallet for migrating Identity to a parachain. To be removed post-migration.
 		IdentityMigrator: identity_migrator = 248,
 
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 67cb9e3ccb832..6d8ba63f26991 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1413,13 +1413,6 @@ construct_runtime! {
 		Offences: pallet_offences = 7,
 		Historical: session_historical = 27,
 
-		// BEEFY Bridges support.
-		Beefy: pallet_beefy = 200,
-		// MMR leaf construction must be before session in order to have leaf contents refer to
-		// block<N-1> consistently. see substrate issue #11797 for details.
-		Mmr: pallet_mmr = 201,
-		BeefyMmrLeaf: pallet_beefy_mmr = 202,
-
 		Session: pallet_session = 8,
 		Grandpa: pallet_grandpa = 10,
 		AuthorityDiscovery: pallet_authority_discovery = 12,
@@ -1509,6 +1502,13 @@ construct_runtime! {
 		// Root testing pallet.
 		RootTesting: pallet_root_testing = 102,
 
+		// BEEFY Bridges support.
+		Beefy: pallet_beefy = 200,
+		// MMR leaf construction must be after session in order to have a leaf's next_auth_set
+		// refer to block<N>. See issue polkadot-fellows/runtimes#160 for details.
+		Mmr: pallet_mmr = 201,
+		BeefyMmrLeaf: pallet_beefy_mmr = 202,
+
 		// Pallet for migrating Identity to a parachain. To be removed post-migration.
 		IdentityMigrator: identity_migrator = 248,
 	}
diff --git a/prdoc/pr_3108.prdoc b/prdoc/pr_3108.prdoc
new file mode 100644
index 0000000000000..3f3259b1004f7
--- /dev/null
+++ b/prdoc/pr_3108.prdoc
@@ -0,0 +1,18 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: revert paritytech/polkadot#6577 & related changes
+
+doc:
+  - audience: Node Dev
+    description: |
+      Moves BEEFY related pallets behind `session_pallet` for Rococo and Westend runtimes.
+      Effects that each `MmrLeaf` in the MMR generated by `mmr_pallet` for `block<N>` references the `next_auth_set` of `block<N>` and not `block<N-1>`.
+      Breaking change for proofs generated by `mmr_generateProof`
+  - audience: Runtime Dev
+    description: |
+      Moves BEEFY related pallets behind `session_pallet` for Rococo and Westend runtimes.
+      Effects that each `MmrLeaf` in the MMR generated by `mmr_pallet` for `block<N>` references the `next_auth_set` of `block<N>` and not `block<N-1>`.
+
+
+crates: []