Merge branch 'main' into ab/encointer-democracy-swap-native

polkadot-fellows · Jan 14, 2025 · d1d9e43 · d1d9e43
2 parents 40c6766 + b677b84
commit d1d9e43
Show file tree

Hide file tree

Showing 294 changed files with 10,237 additions and 10,201 deletions.
diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs
@@ -2051,12 +2051,13 @@ mod benches {
 		[runtime_parachains::initializer, Initializer]
 		[runtime_parachains::paras_inherent, ParaInherent]
 		[runtime_parachains::paras, Paras]
-		[runtime_parachains::assigner_on_demand, OnDemandAssignmentProvider]
+		[runtime_parachains::on_demand, OnDemandAssignmentProvider]
 		[runtime_parachains::coretime, Coretime]
 		// Substrate
 		[pallet_balances, Native]
 		[pallet_balances, NisCounterpart]
 		[pallet_bags_list, VoterList]
+		[pallet_beefy_mmr, BeefyMmrLeaf]
 		[frame_benchmarking::baseline, Baseline::<Runtime>]
 		[pallet_bounties, Bounties]
 		[pallet_child_bounties, ChildBounties]

diff --git a/relay/kusama/src/weights/frame_benchmarking_baseline.rs b/relay/kusama/src/weights/frame_benchmarking_baseline.rs
diff --git a/relay/kusama/src/weights/frame_election_provider_support.rs b/relay/kusama/src/weights/frame_election_provider_support.rs
diff --git a/relay/kusama/src/weights/frame_system.rs b/relay/kusama/src/weights/frame_system.rs
diff --git a/relay/kusama/src/weights/pallet_asset_rate.rs b/relay/kusama/src/weights/pallet_asset_rate.rs
diff --git a/relay/kusama/src/weights/pallet_bags_list.rs b/relay/kusama/src/weights/pallet_bags_list.rs