From bce8a389ecb3a57b0cedaba6e2ac8c4b5027ed55 Mon Sep 17 00:00:00 2001 From: Robert Hambrock Date: Thu, 12 Jan 2023 10:36:08 +0100 Subject: [PATCH 1/2] move pallet_mmr ahead of pallet_session addresses #11797 --- runtime/rococo/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 91a095cf23f5..d865629a23d3 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1350,6 +1350,7 @@ construct_runtime! { Authorship: pallet_authorship::{Pallet, Call, Storage} = 5, Offences: pallet_offences::{Pallet, Storage, Event} = 7, Historical: session_historical::{Pallet} = 34, + Mmr: pallet_mmr::{Pallet, Storage} = 241, Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 8, Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10, ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config} = 11, @@ -1434,7 +1435,6 @@ construct_runtime! { // // BEEFY Bridges support. Beefy: pallet_beefy::{Pallet, Storage, Config} = 240, - Mmr: pallet_mmr::{Pallet, Storage} = 241, MmrLeaf: pallet_beefy_mmr::{Pallet, Storage} = 242, ParasSudoWrapper: paras_sudo_wrapper::{Pallet, Call} = 250, From 3ac0bc5766ad91ec896530e87022bebe220edbbb Mon Sep 17 00:00:00 2001 From: Robert Hambrock Date: Wed, 18 Jan 2023 09:59:19 +0100 Subject: [PATCH 2/2] document construction of mmr leaf prior to session --- runtime/rococo/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index d865629a23d3..88d6f300c7db 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1350,6 +1350,8 @@ construct_runtime! { Authorship: pallet_authorship::{Pallet, Call, Storage} = 5, Offences: pallet_offences::{Pallet, Storage, Event} = 7, Historical: session_historical::{Pallet} = 34, + // MMR leaf construction must be before session in order to have leaf contents + // refer to block consistently. see substrate issue #11797 for details. Mmr: pallet_mmr::{Pallet, Storage} = 241, Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 8, Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10,