Nomination Pools migration v5: RewardPool fix (#6957)

* pools migration v5 * Allow deprecated Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Keep old migrations around Signed-off-by: Oliver Tale-Yazdi <[email protected]> * update lockfile for {"substrate"} * use master Cargo.lock * revert Cargo.lock master * clippy: remove unused parentheses Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Fix parachain config migration Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Make tests work Signed-off-by: Oliver Tale-Yazdi <[email protected]> --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: parity-processbot <>
paritytech · Mar 27, 2023 · 9dd4633 · 9dd4633
1 parent a2b62fb
commit 9dd4633
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -1465,12 +1465,18 @@ impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
 
 /// All migrations that will run on the next runtime upgrade.
 ///
-/// Should be cleared after every release.
+/// This contains the combined migrations of the last 10 releases. It allows to skip runtime
+/// upgrades in case governance decides to do so.
+#[allow(deprecated)]
 pub type Migrations = (
+ // 0.9.40
  pallet_nomination_pools::migration::v4::MigrateToV4<
  Runtime,
  NominationPoolsMigrationV4OldPallet,
  >,
+ // Unreleased - add new migrations here:
+ pallet_nomination_pools::migration::v5::MigrateToV5<Runtime>,
+ parachains_configuration::migration::v5::MigrateToV5<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/runtime/parachains/src/configuration/migration.rs b/runtime/parachains/src/configuration/migration.rs
@@ -143,7 +143,7 @@ pub mod v4 {
  fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
  log::trace!(target: crate::configuration::LOG_TARGET, "Running pre_upgrade()");
 
- ensure!(StorageVersion::get::<Pallet<T>>() == 3, "The migration requires version 3");
+ ensure!(StorageVersion::get::<Pallet<T>>() == 4, "The migration requires version 4");
  Ok(Vec::new())
  }
 

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -1594,12 +1594,17 @@ impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
 
 /// All migrations that will run on the next runtime upgrade.
 ///
-/// Should be cleared after every release.
+/// This contains the combined migrations of the last 10 releases. It allows to skip runtime upgrades in case governance decides to do so.
+#[allow(deprecated)]
 pub type Migrations = (
+ // 0.9.40
  pallet_nomination_pools::migration::v4::MigrateToV4<
  Runtime,
  NominationPoolsMigrationV4OldPallet,
  >,
+ // Unreleased - add new migrations here:
+ pallet_nomination_pools::migration::v5::MigrateToV5<Runtime>,
+ parachains_configuration::migration::v5::MigrateToV5<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
@@ -1469,8 +1469,9 @@ pub type UncheckedExtrinsic =
 
 /// All migrations that will run on the next runtime upgrade.
 ///
-/// Should be cleared after every release.
-pub type Migrations = ();
+/// This contains the combined migrations of the last 10 releases. It allows to skip runtime
+/// upgrades in case governance decides to do so.
+pub type Migrations = parachains_configuration::migration::v5::MigrateToV5<Runtime>;
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<

diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
@@ -201,7 +201,7 @@ impl pallet_indices::Config for Runtime {
 }
 
 parameter_types! {
- pub storage ExistentialDeposit: Balance = 1 * CENTS;
+ pub const ExistentialDeposit: Balance = 1 * CENTS;
  pub storage MaxLocks: u32 = 50;
  pub const MaxReserves: u32 = 50;
 }

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -1206,12 +1206,19 @@ impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
 
 /// All migrations that will run on the next runtime upgrade.
 ///
-/// Should be cleared after every release.
+/// This contains the combined migrations of the last 10 releases. It allows to skip runtime
+/// upgrades in case governance decides to do so.
+#[allow(deprecated)]
 pub type Migrations = (
+ // 0.9.40
+ clean_state_migration::CleanMigrate,
  pallet_nomination_pools::migration::v4::MigrateToV4<
  Runtime,
  NominationPoolsMigrationV4OldPallet,
  >,
+ // Unreleased - add new migrations here:
+ pallet_nomination_pools::migration::v5::MigrateToV5<Runtime>,
+ parachains_configuration::migration::v5::MigrateToV5<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.