Merge pull request #1155 from opentensor/fix/migrate-is-network-member

Migrate to fix IsNetworkMember

pallets/subtensor/src/coinbase/root.rs

@@ -527,6 +527,7 @@ impl<T: Config> Pallet<T> {
 
         // --- 7. Remove incentive mechanism memory.
         let _ = Uids::<T>::clear_prefix(netuid, u32::MAX, None);
+        let keys = Keys::<T>::iter_prefix(netuid).collect::<Vec<_>>();
         let _ = Keys::<T>::clear_prefix(netuid, u32::MAX, None);
         let _ = Bonds::<T>::clear_prefix(netuid, u32::MAX, None);
 
@@ -564,6 +565,10 @@ impl<T: Config> Pallet<T> {
         ValidatorPermit::<T>::remove(netuid);
         ValidatorTrust::<T>::remove(netuid);
 
+        for (_uid, key) in keys {
+            IsNetworkMember::<T>::remove(key, netuid);
+        }
+
         // --- 11. Erase network parameters.
         Tempo::<T>::remove(netuid);
         Kappa::<T>::remove(netuid);

pallets/subtensor/src/macros/hooks.rs

@@ -74,7 +74,9 @@ mod hooks {
                 // Migrate Commit-Reval 2.0
                 .saturating_add(migrations::migrate_commit_reveal_v2::migrate_commit_reveal_2::<T>())
                 // Migrate to RAO
-                .saturating_add(migrations::migrate_rao::migrate_rao::<T>());
+                .saturating_add(migrations::migrate_rao::migrate_rao::<T>())
+				// Fix the IsNetworkMember map to be consistent with other storage maps
+				.saturating_add(migrations::migrate_fix_is_network_member::migrate_fix_is_network_member::<T>());
             weight
         }
 

pallets/subtensor/src/migrations/migrate_fix_is_network_member.rs

@@ -0,0 +1,59 @@
+use super::*;
+use alloc::string::String;
+use frame_support::{traits::Get, weights::Weight};
+use log;
+
+pub fn migrate_fix_is_network_member<T: Config>() -> Weight {
+    let migration_name = b"migrate_fix_is_network_member".to_vec();
+
+    // Initialize the weight with one read operation.
+    let mut weight = T::DbWeight::get().reads(1);
+
+    // Check if the migration has already run
+    if HasMigrationRun::<T>::get(&migration_name) {
+        log::info!(
+            "Migration '{:?}' has already run. Skipping.",
+            migration_name
+        );
+        return weight;
+    }
+    log::info!(
+        "Running migration '{}'",
+        String::from_utf8_lossy(&migration_name)
+    );
+
+    weight = do_fix_is_network_member::<T>(weight);
+
+    // Mark the migration as completed
+    HasMigrationRun::<T>::insert(&migration_name, true);
+    weight = weight.saturating_add(T::DbWeight::get().writes(1));
+
+    log::info!(
+        "Migration '{:?}' completed. Storage version set to 7.",
+        String::from_utf8_lossy(&migration_name)
+    );
+
+    // Return the migration weight.
+    weight
+}
+
+fn do_fix_is_network_member<T: Config>(weight: Weight) -> Weight {
+    let mut weight = weight;
+    // Clear the IsNetworkMember storage
+    let mut curr = IsNetworkMember::<T>::clear(u32::MAX, None);
+    weight = weight
+        .saturating_add(T::DbWeight::get().reads_writes(curr.loops as u64, curr.unique as u64));
+    while curr.maybe_cursor.is_some() {
+        // Clear until empty
+        curr = IsNetworkMember::<T>::clear(u32::MAX, curr.maybe_cursor.as_deref());
+        weight = weight
+            .saturating_add(T::DbWeight::get().reads_writes(curr.loops as u64, curr.unique as u64));
+    }
+    // Repopulate the IsNetworkMember storage using the Keys map
+    for (netuid, _uid, key) in Keys::<T>::iter() {
+        IsNetworkMember::<T>::insert(key, netuid, true);
+        weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+    }
+
+    weight
+}

pallets/subtensor/src/migrations/mod.rs

@@ -4,6 +4,7 @@ pub mod migrate_commit_reveal_v2;
 pub mod migrate_create_root_network;
 pub mod migrate_delete_subnet_21;
 pub mod migrate_delete_subnet_3;
+pub mod migrate_fix_is_network_member;
 pub mod migrate_fix_total_coldkey_stake;
 pub mod migrate_init_total_issuance;
 pub mod migrate_populate_owned_hotkeys;