clear corrupt unified mapping

Author: ermalkaleci

pallets/unified-accounts/src/lib.rs

@@ -88,6 +88,7 @@ use sp_std::marker::PhantomData;
 
 pub use pallet::*;
 
+pub mod migration;
 pub mod weights;
 pub use weights::WeightInfo;
 

pallets/unified-accounts/src/migration.rs

@@ -0,0 +1,51 @@
+use super::{Config, Pallet, Weight};
+use astar_primitives::evm::EvmAddress;
+use frame_support::{
+    pallet_prelude::OptionQuery,
+    storage_alias,
+    traits::{Get, OnRuntimeUpgrade},
+    Blake2_128Concat,
+};
+
+#[storage_alias]
+type EvmToNative<T: Config> = StorageMap<
+    Pallet<T>,
+    Blake2_128Concat,
+    <T as frame_system::Config>::AccountId,
+    EvmAddress,
+    OptionQuery,
+>;
+
+#[storage_alias]
+type NativeToEvm<T: Config> = StorageMap<
+    Pallet<T>,
+    Blake2_128Concat,
+    EvmAddress,
+    <T as frame_system::Config>::AccountId,
+    OptionQuery,
+>;
+
+/// Remove all corrupted mappings.
+pub struct ClearCorruptedUnifiedMappings<T>(core::marker::PhantomData<T>);
+impl<T: Config> OnRuntimeUpgrade for ClearCorruptedUnifiedMappings<T> {
+    fn on_runtime_upgrade() -> Weight {
+        let healthy_count = crate::EvmToNative::<T>::iter().count() as u64 * 2;
+        log::info!("Total healthy entries: {healthy_count}");
+
+        let mut count = 0;
+        // translate will fail to decode valid entries and therefore will skip it,
+        // so this will remove only corrupt entries
+        EvmToNative::<T>::translate(|key, value: EvmAddress| {
+            log::debug!("Remove corrupt key: {key:?} with value: {value:?}");
+            count += 1;
+            None
+        });
+        NativeToEvm::<T>::translate(|key, value: T::AccountId| {
+            log::debug!("Remove corrupt key: {key:?} with value: {value:?}");
+            count += 1;
+            None
+        });
+        log::info!("Removed {count} corrupt entries");
+        T::DbWeight::get().reads_writes(healthy_count + writes, count)
+    }
+}

runtime/shibuya/src/lib.rs

@@ -1625,53 +1625,14 @@ pub type Executive = frame_executive::Executive<
 /// Once done, migrations should be removed from the tuple.
 pub type Migrations = (
     cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
-    GovernancePalletsVersionSetting,
     // permanent migration, do not remove
     pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
     // XCM V3 -> V4
     pallet_xc_asset_config::migrations::versioned::V2ToV3<Runtime>,
     pallet_identity::migration::versioned::V0ToV1<Runtime, 250>,
+    pallet_unified_accounts::migration::ClearCorruptedUnifiedMappings<Runtime>,
 );
 
-use frame_support::traits::{GetStorageVersion, OnRuntimeUpgrade};
-pub struct GovernancePalletsVersionSetting;
-impl OnRuntimeUpgrade for GovernancePalletsVersionSetting {
-    fn on_runtime_upgrade() -> Weight {
-        // 1. Membership pallet instances
-        let membership_storage_version = pallet_membership::Pallet::<
-            Runtime,
-            MainCouncilMembershipInst,
-        >::in_code_storage_version();
-
-        membership_storage_version
-            .put::<pallet_membership::Pallet<Runtime, MainCouncilMembershipInst>>();
-        membership_storage_version
-            .put::<pallet_membership::Pallet<Runtime, TechnicalCommitteeCollectiveInst>>();
-        membership_storage_version
-            .put::<pallet_membership::Pallet<Runtime, CommunityCouncilMembershipInst>>();
-
-        // 2. Collective pallet instances
-        let collective_storage_version = pallet_collective::Pallet::<
-            Runtime,
-            MainCouncilCollectiveInst,
-        >::in_code_storage_version();
-
-        collective_storage_version
-            .put::<pallet_collective::Pallet<Runtime, MainCouncilCollectiveInst>>();
-        collective_storage_version
-            .put::<pallet_collective::Pallet<Runtime, TechnicalCommitteeCollectiveInst>>();
-        collective_storage_version
-            .put::<pallet_collective::Pallet<Runtime, CommunityCouncilCollectiveInst>>();
-
-        // 3. Democracy pallet
-        let democracy_storage_version =
-            pallet_democracy::Pallet::<Runtime>::in_code_storage_version();
-        democracy_storage_version.put::<pallet_democracy::Pallet<Runtime>>();
-
-        <Runtime as frame_system::Config>::DbWeight::get().writes(7)
-    }
-}
-
 type EventRecord = frame_system::EventRecord<
     <Runtime as frame_system::Config>::RuntimeEvent,
     <Runtime as frame_system::Config>::Hash,