Merge branch 'main' into disable-create-agent-channel

polkadot-fellows · Dec 19, 2024 · 1863a72 · 1863a72
2 parents 5ae3e34 + 5b61c46
commit 1863a72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+- Fix missing Encointer democracy pallet hook needed for enactment ([polkadot-fellows/runtimes/pull/508](https://github.com/polkadot-fellows/runtimes/pull/508))
+
 ### Added
 
 - Location conversion tests for relays and parachains ([polkadot-fellows/runtimes#487](https://github.com/polkadot-fellows/runtimes/pull/487))

diff --git a/system-parachains/encointer/src/lib.rs b/system-parachains/encointer/src/lib.rs
@@ -483,7 +483,9 @@ parameter_types! {
 
 impl pallet_encointer_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type OnCeremonyPhaseChange = EncointerCeremonies;
+	// attention!: EncointerDemocracy must be first hook as it potentially changes the rules for
+	// following hooks
+	type OnCeremonyPhaseChange = (EncointerDemocracy, EncointerCeremonies);
 	type MomentsPerDay = MomentsPerDay;
 	type CeremonyMaster = MoreThanHalfCouncil;
 	type WeightInfo = weights::pallet_encointer_scheduler::WeightInfo<Runtime>;