From b62f85d36e17c8ebebdce8e438f37274f16013aa Mon Sep 17 00:00:00 2001 From: Robert Hambrock Date: Thu, 19 Jan 2023 12:58:45 +0100 Subject: [PATCH] construct mmr leaf prior to session pallet hook (#6577) * move pallet_mmr ahead of pallet_session addresses #11797 * document construction of mmr leaf prior to session --- runtime/rococo/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 879db0fa2a45..1855b82b98ae 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1352,6 +1352,9 @@ 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, ImOnline: pallet_im_online::{Pallet, Call, Storage, Event, ValidateUnsigned, Config} = 11, @@ -1436,7 +1439,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,