Merge pull request #2226 from cuteolaf/clean-up-subnet-identities-storage

Clean up subnet identities storage

Author: sam0x17

pallets/subtensor/src/benchmarks.rs

@@ -446,15 +446,16 @@ mod pallet_benchmarks {
 
         Subtensor::<T>::add_balance_to_coldkey_account(&old_coldkey, free_balance_old.into());
         let name: Vec<u8> = b"The fourth Coolest Identity".to_vec();
-        let identity = ChainIdentity {
+        let identity = ChainIdentityV2 {
             name,
             url: vec![],
+            github_repo: vec![],
             image: vec![],
             discord: vec![],
             description: vec![],
             additional: vec![],
         };
-        Identities::<T>::insert(&old_coldkey, identity);
+        IdentitiesV2::<T>::insert(&old_coldkey, identity);
 
         #[extrinsic_call]
         _(

pallets/subtensor/src/coinbase/root.rs

@@ -391,8 +391,6 @@ impl<T: Config> Pallet<T> {
         let _ = LastHotkeySwapOnNetuid::<T>::clear_prefix(netuid, u32::MAX, None);
 
         // --- 20. Identity maps across versions (netuid-scoped).
-        SubnetIdentities::<T>::remove(netuid);
-        SubnetIdentitiesV2::<T>::remove(netuid);
         if SubnetIdentitiesV3::<T>::contains_key(netuid) {
             SubnetIdentitiesV3::<T>::remove(netuid);
             Self::deposit_event(Event::SubnetIdentityRemoved(netuid));

pallets/subtensor/src/lib.rs

@@ -2057,26 +2057,11 @@ pub mod pallet {
         OptionQuery,
     >;
 
-    /// --- MAP ( coldkey ) --> identity. (DEPRECATED for V2)
-    #[pallet::storage]
-    pub type Identities<T: Config> =
-        StorageMap<_, Blake2_128Concat, T::AccountId, ChainIdentityOf, OptionQuery>;
-
     /// --- MAP ( coldkey ) --> identity
     #[pallet::storage]
     pub type IdentitiesV2<T: Config> =
         StorageMap<_, Blake2_128Concat, T::AccountId, ChainIdentityOfV2, OptionQuery>;
 
-    /// --- MAP ( netuid ) --> identity. (DEPRECATED for V2)
-    #[pallet::storage]
-    pub type SubnetIdentities<T: Config> =
-        StorageMap<_, Blake2_128Concat, NetUid, SubnetIdentityOf, OptionQuery>;
-
-    /// --- MAP ( netuid ) --> identityV2 (DEPRECATED for V3)
-    #[pallet::storage]
-    pub type SubnetIdentitiesV2<T: Config> =
-        StorageMap<_, Blake2_128Concat, NetUid, SubnetIdentityOfV2, OptionQuery>;
-
     /// --- MAP ( netuid ) --> SubnetIdentityOfV3
     #[pallet::storage]
     pub type SubnetIdentitiesV3<T: Config> =

pallets/subtensor/src/macros/hooks.rs

@@ -75,17 +75,13 @@ mod hooks {
                 // Populate OwnedHotkeys map for coldkey swap. Doesn't update storage vesion.
                 // Storage version v6 -> v7
                 .saturating_add(migrations::migrate_populate_owned_hotkeys::migrate_populate_owned::<T>())
-                // Migrate Delegate Ids on chain
-                .saturating_add(migrations::migrate_chain_identity::migrate_set_hotkey_identities::<T>())
                 // 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>())
 				// 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>())
 				.saturating_add(migrations::migrate_subnet_volume::migrate_subnet_volume::<T>())
-                // Upgrade identities to V2
-                .saturating_add(migrations::migrate_identities_v2::migrate_identities_to_v2::<T>())
 				// Set the min burn across all subnets to a new minimum
 				.saturating_add(migrations::migrate_set_min_burn::migrate_set_min_burn::<T>())
 				// Set the min difficulty across all subnets to a new minimum
@@ -121,8 +117,6 @@ mod hooks {
                 .saturating_add(migrations::migrate_fix_root_subnet_tao::migrate_fix_root_subnet_tao::<T>())
                 // Fix the owner disable the registration
                 .saturating_add(migrations::migrate_set_registration_enable::migrate_set_registration_enable::<T>())
-                // Migrate Subnet Identities to V3
-                .saturating_add(migrations::migrate_subnet_identities_to_v3::migrate_subnet_identities_to_v3::<T>())
                 // Migrate subnet symbols to fix the shift after subnet 81
                 .saturating_add(migrations::migrate_subnet_symbols::migrate_subnet_symbols::<T>())
                 // Migrate CRV3 add commit_block
@@ -163,6 +157,8 @@ mod hooks {
                 .saturating_add(migrations::migrate_pending_emissions::migrate_pending_emissions::<T>())
                 // Reset unactive subnets
                 .saturating_add(migrations::migrate_reset_unactive_sn::migrate_reset_unactive_sn::<T>())
+                // Remove old identity map entries(Identities, SubnetIdentities, SubnetIdentitiesV2)
+                .saturating_add(migrations::migrate_remove_old_identity_maps::migrate_remove_old_identity_maps::<T>())
                 // Remove unknown neuron axon, certificate prom
                 .saturating_add(migrations::migrate_remove_unknown_neuron_axon_cert_prom::migrate_remove_unknown_neuron_axon_cert_prom::<T>());
             weight

pallets/subtensor/src/migrations/migrate_chain_identity.rs

@@ -0,0 +1,43 @@
+use super::*;
+use crate::HasMigrationRun;
+use frame_support::{traits::Get, weights::Weight};
+use scale_info::prelude::string::String;
+
+pub fn migrate_remove_old_identity_maps<T: Config>() -> Weight {
+    let migration_name = b"migrate_remove_old_identity_maps".to_vec();
+    let mut weight = T::DbWeight::get().reads(1);
+
+    if HasMigrationRun::<T>::get(&migration_name) {
+        log::info!(
+            "Migration '{:?}' has already run. Skipping.",
+            String::from_utf8_lossy(&migration_name)
+        );
+        return weight;
+    }
+
+    log::info!(
+        "Running migration '{}'",
+        String::from_utf8_lossy(&migration_name),
+    );
+
+    // ------------------------------
+    // Step 1: Remove Map entries
+    // ------------------------------
+    remove_prefix::<T>("SubtensorModule", "Identities", &mut weight);
+    remove_prefix::<T>("SubtensorModule", "SubnetIdentities", &mut weight);
+    remove_prefix::<T>("SubtensorModule", "SubnetIdentitiesV2", &mut weight);
+
+    // ------------------------------
+    // Step 2: Mark Migration as Completed
+    // ------------------------------
+
+    HasMigrationRun::<T>::insert(&migration_name, true);
+    weight = weight.saturating_add(T::DbWeight::get().writes(1));
+
+    log::info!(
+        "Migration '{:?}' completed successfully.",
+        String::from_utf8_lossy(&migration_name)
+    );
+
+    weight
+}