add versioned migration and bump spec version

Author: vedhavyas

crates/pallet-domains/src/benchmarking.rs

@@ -777,6 +777,7 @@ mod benchmarks {
                     operator_id,
                     deposit,
                     domain_stake_summary.current_epoch_index,
+                    None,
                 )
                 .unwrap();
                 Ok::<T::Share, StakingError>(deposit.known.shares)
@@ -799,6 +800,7 @@ mod benchmarks {
                 operator_id,
                 withdrawal,
                 current_domain_epoch_index,
+                None,
             )?;
             assert_eq!(withdrawal.withdrawals.len() as u32, w);
             Ok::<(), StakingError>(())

crates/pallet-domains/src/lib.rs

@@ -187,7 +187,7 @@ impl<T: Config> sp_domains::SkipBalanceChecks for DomainsSkipBalanceChecks<T> {
 }
 
 /// The current storage version.
-const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
+const STORAGE_VERSION: StorageVersion = StorageVersion::new(6);
 
 /// The number of bundle of a particular domain to be included in the block is probabilistic
 /// and based on the consensus chain slot probability and domain bundle slot probability, usually

crates/pallet-domains/src/migrations.rs

@@ -1,7 +1,9 @@
 mod v1_to_v5;
+mod v5_to_v6;
 
 pub(crate) use share_price_v0::OperatorEpochSharePrice as OperatorEpochSharePriceV0;
 pub use v1_to_v5::VersionCheckedMigrateDomainsV1ToV5;
+pub use v5_to_v6::VersionCheckedMigrateDomainsV5ToV6;
 
 mod share_price_v0 {
     use crate::staking::{DomainEpoch, SharePrice as SharePriceV1};

crates/pallet-domains/src/migrations/v5_to_v6.rs

@@ -0,0 +1,24 @@
+//! Migration module for pallet-domains
+
+use crate::{AllowedDefaultSharePriceEpoch, AllowedMissingSharePriceEpoch, Config, Pallet};
+use core::marker::PhantomData;
+use frame_support::migrations::VersionedMigration;
+use frame_support::traits::UncheckedOnRuntimeUpgrade;
+use frame_support::weights::Weight;
+use sp_core::Get;
+
+pub type VersionCheckedMigrateDomainsV5ToV6<T> = VersionedMigration<
+    5,
+    6,
+    VersionUncheckedMigrateV5ToV6<T>,
+    Pallet<T>,
+    <T as frame_system::Config>::DbWeight,
+>;
+
+pub struct VersionUncheckedMigrateV5ToV6<T>(PhantomData<T>);
+impl<T: Config> UncheckedOnRuntimeUpgrade for VersionUncheckedMigrateV5ToV6<T> {
+    fn on_runtime_upgrade() -> Weight {
+        AllowedDefaultSharePriceEpoch::<T>::put(AllowedMissingSharePriceEpoch::get());
+        T::DbWeight::get().writes(1)
+    }
+}

crates/pallet-domains/src/staking_epoch.rs

@@ -1022,7 +1022,6 @@ pub(crate) mod tests {
         epoch_index: EpochIndex,
     ) {
         let domain_epoch: DomainEpoch = (domain_id, epoch_index).into();
-        println!("{:?}", domain_epoch);
         for operator_id in operators {
             assert!(OperatorEpochSharePrice::<Test>::contains_key(
                 operator_id,

crates/subspace-runtime/src/lib.rs

@@ -128,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     impl_name: Cow::Borrowed("subspace"),
     authoring_version: 0,
     // The spec version can be different on Taurus and Mainnet
-    spec_version: 19,
+    spec_version: 20,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 0,
@@ -1135,12 +1135,7 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
-    // TODO: remove only after migrations are run on Mainnet
-    (
-        pallet_domains::migrations::VersionCheckedMigrateDomainsV1ToV5<Runtime>,
-        pallet_messenger::migrations::VersionCheckedMigrateDomainsV0ToV1<Runtime>,
-        pallet_messenger::migrations::VersionCheckedMigrateDomainsV1ToV2<Runtime>,
-    ),
+    (pallet_domains::migrations::VersionCheckedMigrateDomainsV5ToV6<Runtime>,),
 >;
 
 impl pallet_subspace::extensions::MaybeSubspaceCall<Runtime> for RuntimeCall {