diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 52cd0f8b6f..e93936b606 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -807,7 +807,7 @@ impl pallet_staking::Config for Runtime { type HistoryDepth = frame_support::traits::ConstU32<84>; type MaxControllersInDeprecationBatch = ConstU32<5169>; type BenchmarkingConfig = polkadot_runtime_common::StakingBenchmarkingConfig; - type EventListeners = (NominationPools, DelegatedStaking); + type EventListeners = NominationPools; type DisablingStrategy = pallet_staking::UpToLimitDisablingStrategy; type WeightInfo = weights::pallet_staking::WeightInfo; } @@ -1615,8 +1615,7 @@ impl pallet_nomination_pools::Config for Runtime { type RewardCounter = FixedU128; type BalanceToU256 = BalanceToU256; type U256ToBalance = U256ToBalance; - type StakeAdapter = - pallet_nomination_pools::adapter::DelegateStake; + type StakeAdapter = pallet_nomination_pools::adapter::TransferStake; type PostUnbondingPoolsWindow = ConstU32<4>; type MaxMetadataLen = ConstU32<256>; // we use the same number of allowed unlocking chunks as with staking. @@ -1831,13 +1830,6 @@ impl Get for NominationPoolsMigrationV4OldPallet { } } -parameter_types! { - // This is used to limit max pools that migrates in the runtime upgrade. This is set to - // existing_pool_count plus ~15 to also account for any new pools getting created before the - // migration is actually executed. - pub const MaxPoolsToMigrate: u32 = 200; -} - /// All migrations that will run on the next runtime upgrade. /// /// This contains the combined migrations of the last 10 releases. It allows to skip runtime @@ -1856,11 +1848,6 @@ pub mod migrations { parachains_inclusion::migration::MigrateToV1, parachains_on_demand::migration::MigrateV0ToV1, restore_corrupted_ledgers::Migrate, - // Migrate NominationPools to `DelegateStake` adapter. This is an unversioned upgrade. - pallet_nomination_pools::migration::unversioned::DelegationStakeMigration< - Runtime, - MaxPoolsToMigrate, - >, ); /// Migrations/checks that do not need to be versioned and can run on every update. diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs index 34da587d0c..5e661fa473 100644 --- a/relay/polkadot/src/lib.rs +++ b/relay/polkadot/src/lib.rs @@ -2059,10 +2059,10 @@ pub mod migrations { } parameter_types! { - // This is used to limit max pools that migrates in the runtime upgrade. This is set to - // existing_pool_count plus ~15 to also account for any new pools getting created before the + // This is used to bound number of pools migrating in the runtime upgrade. This is set to + // ~existing_pool_count * 2 to also account for any new pools getting created before the // migration is actually executed. - pub const MaxPoolsToMigrate: u32 = 250; + pub const MaxPoolsToMigrate: u32 = 500; } /// Unreleased migrations. Add new ones here: