chore: intermediate release for dev/qa (specVersion: 109) #432

Author: DylanVerstraete

substrate-node/pallets/pallet-tfgrid/src/grid_migration.rs

@@ -89,7 +89,7 @@ pub mod deprecated {
     }
 }
 
-pub mod v7 {
+pub mod v9 {
     use super::*;
     use crate::Config;
 
@@ -112,7 +112,7 @@ pub mod v7 {
 
         #[cfg(feature = "try-runtime")]
         fn post_upgrade() -> Result<(), &'static str> {
-            assert!(PalletVersion::<T>::get() == types::StorageVersion::V8Struct);
+            assert!(PalletVersion::<T>::get() == types::StorageVersion::V9Struct);
 
             info!(
                 "👥  TFGrid pallet migration to {:?} passes POST migrate checks ✅",
@@ -297,7 +297,7 @@ pub fn migrate_farms<T: Config>() -> frame_support::weights::Weight {
     );
 
     // Update pallet storage version
-    PalletVersion::<T>::set(types::StorageVersion::V8Struct);
+    PalletVersion::<T>::set(types::StorageVersion::V9Struct);
     info!(" <<< Storage version upgraded");
 
     // Return the weight consumed by the migration.

substrate-node/pallets/pallet-tfgrid/src/lib.rs

@@ -34,6 +34,7 @@ pub mod types;
 pub mod farm;
 pub mod grid_migration;
 pub mod interface;
+pub mod nodes_migration_v3;
 pub mod pub_config;
 pub mod pub_ip;
 pub mod twin;

substrate-node/pallets/pallet-tfgrid/src/nodes_migration_v3.rs

@@ -0,0 +1,82 @@
+use super::Config;
+use super::*;
+use frame_support::{traits::Get, weights::Weight};
+use log::info;
+use sp_std::collections::btree_map::BTreeMap;
+
+pub mod v9patch {
+    use super::*;
+    use crate::Config;
+
+    use frame_support::{pallet_prelude::Weight, traits::OnRuntimeUpgrade};
+    use sp_std::marker::PhantomData;
+    pub struct FixFarmNodeIndexMap<T: Config>(PhantomData<T>);
+
+    impl<T: Config> OnRuntimeUpgrade for FixFarmNodeIndexMap<T> {
+        #[cfg(feature = "try-runtime")]
+        fn pre_upgrade() -> Result<(), &'static str> {
+            assert!(PalletVersion::<T>::get() == types::StorageVersion::V8Struct);
+
+            info!("👥  TFGrid pallet to v4 passes PRE migrate checks ✅",);
+            Ok(())
+        }
+
+        fn on_runtime_upgrade() -> Weight {
+            if PalletVersion::<T>::get() == types::StorageVersion::V8Struct {
+                add_farm_nodes_index::<T>()
+            } else {
+                info!(" >>> Unused migration");
+                return 0;
+            }
+        }
+
+        #[cfg(feature = "try-runtime")]
+        fn post_upgrade() -> Result<(), &'static str> {
+            assert!(PalletVersion::<T>::get() == types::StorageVersion::V9Struct);
+
+            info!(
+                "👥  TFGrid pallet migration to {:?} passes POST migrate checks ✅",
+                Pallet::<T>::pallet_version()
+            );
+
+            Ok(())
+        }
+    }
+}
+
+pub fn add_farm_nodes_index<T: Config>() -> frame_support::weights::Weight {
+    info!(" >>> Migrating nodes storage...");
+
+    NodesByFarmID::<T>::remove_all(None);
+
+    let mut reads = 0;
+    let mut writes = 0;
+
+    let mut farms_with_nodes: BTreeMap<u32, Vec<u32>> = BTreeMap::new();
+    for (_, node) in Nodes::<T>::iter() {
+        // Add index of farm - list (nodes)
+        farms_with_nodes
+            .entry(node.farm_id)
+            .or_insert(vec![])
+            .push(node.id);
+
+        reads += 1;
+    }
+
+    for (farm_id, nodes) in farms_with_nodes.iter() {
+        info!(
+            "inserting nodes: {:?} with farm id: {:?}",
+            nodes.clone(),
+            farm_id
+        );
+        NodesByFarmID::<T>::insert(farm_id, nodes);
+        writes += 1;
+    }
+
+    // Update pallet storage version
+    PalletVersion::<T>::set(types::StorageVersion::V9Struct);
+    info!(" <<< Storage version upgraded");
+
+    // Return the weight consumed by the migration.
+    T::DbWeight::get().reads_writes(reads as Weight + 1, writes as Weight + 1)
+}

substrate-node/pallets/pallet-tfgrid/src/types.rs

@@ -15,6 +15,7 @@ pub enum StorageVersion {
     V6Struct,
     V7Struct,
     V8Struct,
+    V9Struct,
 }
 
 impl Default for StorageVersion {

substrate-node/runtime/src/lib.rs

@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("substrate-threefold"),
     impl_name: create_runtime_str!("substrate-threefold"),
     authoring_version: 1,
-    spec_version: 109,
+    spec_version: 110,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -757,9 +757,9 @@ pub type Executive = frame_executive::Executive<
     Runtime,
     AllPalletsWithSystem,
     (
-        migrations::CustomOnRuntimeUpgrades,
         pallet_smart_contract::contract_migration::v5::ContractMigrationV5<Runtime>,
-        pallet_tfgrid::grid_migration::v7::GridMigration<Runtime>,
+        pallet_tfgrid::grid_migration::v9::GridMigration<Runtime>,
+        pallet_tfgrid::nodes_migration_v3::v9patch::FixFarmNodeIndexMap<Runtime>,
     ),
 >;