runtime migrations

runtime/kusama/src/lib.rs

@@ -1486,11 +1486,43 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
-	MigratePalletVersionToStorageVersion,
+	(
+		// Must run before storage version migration as it checks
+		// storage version to activate
+		BountiesPrefixMigration,
+		MigratePalletVersionToStorageVersion,
+	),
 >;
 /// The payload being signed in the transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
 
+const BOUNTIES_OLD_PREFIX: &str = "Treasury";
+
+/// Migrate from 'Treasury' to the new prefix 'Bounties'
+pub struct BountiesPrefixMigration;
+
+impl OnRuntimeUpgrade for BountiesPrefixMigration {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		use frame_support::traits::PalletInfo;
+		let name = <Runtime as frame_system::Config>::PalletInfo::name::<Bounties>()
+			.expect("Bounties is part of runtime, so it has a name; qed");
+		pallet_bounties::migrations::v4::pre_migration::<Runtime, Bounties, _>(
+			BOUNTIES_OLD_PREFIX,
+			name,
+		);
+		Ok(())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		pallet_bounties::migrations::v4::post_migration::<Bounties>(BOUNTIES_OLD_PREFIX);
+		Ok(())
+	}
+}
+
 /// Migrate from `PalletVersion` to the new `StorageVersion`
 pub struct MigratePalletVersionToStorageVersion;
 

runtime/kusama/src/weights/pallet_vesting.rs

@@ -42,24 +42,23 @@ use sp_std::marker::PhantomData;
 /// Weight functions for `pallet_vesting`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
-	fn vest_locked(l: u32, s: u32, ) -> Weight {
+	fn vest_locked(l: u32, s: u32) -> Weight {
 		(93_789_000 as Weight)
 			// Standard Error: 70_000
 			.saturating_add((41_000 as Weight).saturating_mul(l as Weight))
 			// Standard Error: 182_000
 			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
-
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn vest_unlocked(_l: u32, s: u32, ) -> Weight {
+	fn vest_unlocked(_l: u32, s: u32) -> Weight {
 		(90_737_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((263_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
-	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+	fn vest_other_locked(l: u32, s: u32) -> Weight {
 		(85_211_000 as Weight)
 			// Standard Error: 17_000
 			.saturating_add((153_000 as Weight).saturating_mul(l as Weight))
@@ -68,7 +67,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+	fn vest_other_unlocked(l: u32, s: u32) -> Weight {
 		(90_368_000 as Weight)
 			// Standard Error: 17_000
 			.saturating_add((31_000 as Weight).saturating_mul(l as Weight))
@@ -77,21 +76,21 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	fn vested_transfer(l: u32, _s: u32, ) -> Weight {
+	fn vested_transfer(l: u32, _s: u32) -> Weight {
 		(167_500_000 as Weight)
 			// Standard Error: 194_000
 			.saturating_add((255_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	fn force_vested_transfer(l: u32, _s: u32, ) -> Weight {
+	fn force_vested_transfer(l: u32, _s: u32) -> Weight {
 		(174_000_000 as Weight)
 			// Standard Error: 70_000
 			.saturating_add((143_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
-	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+	fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight {
 		(101_778_000 as Weight)
 			// Standard Error: 17_000
 			.saturating_add((194_000 as Weight).saturating_mul(l as Weight))
@@ -100,7 +99,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
-	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+	fn unlocking_merge_schedules(l: u32, s: u32) -> Weight {
 		(104_111_000 as Weight)
 			// Standard Error: 88_000
 			.saturating_add((276_000 as Weight).saturating_mul(l as Weight))

runtime/polkadot/src/lib.rs

@@ -1126,11 +1126,45 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPallets,
-	MigratePalletVersionToStorageVersion,
+	(
+		BountiesPrefixMigration,
+		MigratePalletVersionToStorageVersion,
+	)
 >;
 /// The payload being signed in transactions.
 pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
 
+const BOUNTIES_OLD_PREFIX: &str = "Treasury";
+
+/// Migrate from 'Treasury' to the new prefix 'Bounties'
+pub struct BountiesPrefixMigration;
+
+impl OnRuntimeUpgrade for BountiesPrefixMigration {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<(), &'static str> {
+		use frame_support::traits::PalletInfo;
+		let name = <Runtime as frame_system::Config>::PalletInfo::name::<Bounties>()
+			.expect("Bounties is part of runtime, so it has a name; qed");
+		pallet_bounties::migrations::v4::pre_migration::<Runtime, Bounties, _>(
+			BOUNTIES_OLD_PREFIX,
+			name,
+		);
+		Ok(())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade() -> Result<(), &'static str> {
+		pallet_bounties::migrations::v4::post_migration::<Bounties>(
+			BOUNTIES_OLD_PREFIX,
+		);
+		Ok(())
+	}
+}
+
 /// Migrate from `PalletVersion` to the new `StorageVersion`
 pub struct MigratePalletVersionToStorageVersion;