From f24b71c4365d7c1e8476d5daf69d416c8d2a6a7b Mon Sep 17 00:00:00 2001 From: Manuel Mauro Date: Thu, 28 May 2026 17:50:43 +0300 Subject: [PATCH 1/2] remove completed ResetStorage migration The multi-block migration introduced in #3569 to clear `XcmTransactor::DestinationAssetFeePerSecond` has run to completion on Moonbeam, Moonriver and Moonbase Alpha (recorded in `MultiBlockMigrations::Historic`, target storage empty, cursor idle), so remove it from the common migrations list. --- runtime/common/src/migrations.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/runtime/common/src/migrations.rs b/runtime/common/src/migrations.rs index d436d39c0b..aa5b4ca900 100644 --- a/runtime/common/src/migrations.rs +++ b/runtime/common/src/migrations.rs @@ -23,7 +23,7 @@ use frame_support::traits::PalletInfoAccess; use frame_support::weights::WeightMeter; use pallet_migrations::WeightInfo; use parity_scale_codec::Encode; -use sp_core::{parameter_types, twox_128, Get}; +use sp_core::{twox_128, Get}; use sp_io::{storage::clear_prefix, KillStorageResult}; use sp_runtime::SaturatedConversion; @@ -285,16 +285,6 @@ pub type SingleBlockMigrations = ( PermanentSingleBlockMigrations, ); -parameter_types! { - pub const DestinationAssetFeePerSecondStorageName: &'static str = "DestinationAssetFeePerSecond"; -} - /// List of common multiblock migrations to be executed by the pallet-migrations pallet. /// The migrations listed here are common to every moonbeam runtime. -pub type MultiBlockMigrations = ( - ResetStorage< - Runtime, - pallet_xcm_transactor::Pallet, - DestinationAssetFeePerSecondStorageName, - >, -); +pub type MultiBlockMigrations = (); From 965022d6d0daa485536ef0ada7093b479c39246f Mon Sep 17 00:00:00 2001 From: Manuel Mauro Date: Thu, 4 Jun 2026 12:36:32 +0300 Subject: [PATCH 2/2] fix unused Runtime generic on empty MultiBlockMigrations Emptying the common multiblock list to `()` left its `Runtime` type parameter unused, which is a hard error (E0091) and broke the `build` and `cargo-clippy` CI jobs. Drop the now-pointless generic from the empty common `MultiBlockMigrations` alias and from each runtime's `MultiBlockMigrationList`, and update the `pallet_migrations::Config` `Migrations` wiring to match. Mirrors the existing `UnreleasedSingleBlockMigrations = ()` convention. --- runtime/common/src/migrations.rs | 2 +- runtime/moonbase/src/lib.rs | 2 +- runtime/moonbase/src/migrations.rs | 4 ++-- runtime/moonbeam/src/lib.rs | 2 +- runtime/moonbeam/src/migrations.rs | 4 ++-- runtime/moonriver/src/lib.rs | 2 +- runtime/moonriver/src/migrations.rs | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runtime/common/src/migrations.rs b/runtime/common/src/migrations.rs index aa5b4ca900..18f7cb8840 100644 --- a/runtime/common/src/migrations.rs +++ b/runtime/common/src/migrations.rs @@ -287,4 +287,4 @@ pub type SingleBlockMigrations = ( /// List of common multiblock migrations to be executed by the pallet-migrations pallet. /// The migrations listed here are common to every moonbeam runtime. -pub type MultiBlockMigrations = (); +pub type MultiBlockMigrations = (); diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 6c8fe3dd5a..717068cbef 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonbase/src/migrations.rs b/runtime/moonbase/src/migrations.rs index 9aa582c9a0..ad35f1d231 100644 --- a/runtime/moonbase/src/migrations.rs +++ b/runtime/moonbase/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonbase specific multiblock migrations ); diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index 4baa86fa51..c7cc5a7990 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonbeam/src/migrations.rs b/runtime/moonbeam/src/migrations.rs index e190d817ce..9655e2c30f 100644 --- a/runtime/moonbeam/src/migrations.rs +++ b/runtime/moonbeam/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonbeam specific multiblock migrations ); diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 6de41d7e19..7bdb7d3613 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -1406,7 +1406,7 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime { impl pallet_migrations::Config for Runtime { type RuntimeEvent = RuntimeEvent; #[cfg(not(feature = "runtime-benchmarks"))] - type Migrations = migrations::MultiBlockMigrationList; + type Migrations = migrations::MultiBlockMigrationList; #[cfg(feature = "runtime-benchmarks")] type Migrations = pallet_migrations::mock_helpers::MockedMigrations; type CursorMaxLen = ConstU32<65_536>; diff --git a/runtime/moonriver/src/migrations.rs b/runtime/moonriver/src/migrations.rs index 49c8541d7f..7ee1f4a3a4 100644 --- a/runtime/moonriver/src/migrations.rs +++ b/runtime/moonriver/src/migrations.rs @@ -36,8 +36,8 @@ pub type SingleBlockMigrations = ( /// List of multi block migrations to be executed by the pallet_migrations. #[cfg(not(feature = "runtime-benchmarks"))] -pub type MultiBlockMigrationList = ( +pub type MultiBlockMigrationList = ( // Common multiblock migrations applied on all Moonbeam runtimes - moonbeam_runtime_common::migrations::MultiBlockMigrations, + moonbeam_runtime_common::migrations::MultiBlockMigrations, // ... Moonriver specific multiblock migrations );