fix: resolve issue for state migration (#600)

blockchain-lab-um · Mar 21, 2024 · ce8a6d5 · ce8a6d5
1 parent 8f38b98
commit ce8a6d5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/.changeset/clever-wasps-explain.md b/.changeset/clever-wasps-explain.md
@@ -0,0 +1,6 @@
+---
+"@blockchain-lab-um/masca-types": patch
+"@blockchain-lab-um/masca": patch
+---
+
+Resolve issue with importing old state.
diff --git a/packages/snap/src/General.service.ts b/packages/snap/src/General.service.ts
@@ -397,6 +397,7 @@ class GeneralService {
       isValidMascaState(latestState);
       StorageService.set(latestState);
     } catch (error) {
+      console.error(error);
       throw new Error('Invalid backup state.');
     }
   }

diff --git a/packages/snap/src/utils/stateMigration.ts b/packages/snap/src/utils/stateMigration.ts
@@ -7,6 +7,18 @@ export const migrateToV2 = (state: MascaLegacyStateV1): MascaState => {
   // Remove friendly dapps
   delete newState.v2.config.dApp.friendlyDapps;
 
+  // Remove goerli from polygon state from all accounts
+  const accounts = Object.keys(newState.v2.accountState);
+
+  for (const account of accounts) {
+    for (const method of ['polygonid', 'iden3']) {
+      for (const chain of ['eth', 'polygon']) {
+        delete newState.v2.accountState[account].polygon.state[method][chain]
+          .goerli;
+      }
+    }
+  }
+
   // Initialize permissions
   newState.v2.config.dApp.permissions = { 'masca.io': getInitialPermissions() };
 

diff --git a/packages/snap/tests/data/legacyStates/legacyStateV1.ts b/packages/snap/tests/data/legacyStates/legacyStateV1.ts
@@ -19,20 +19,24 @@ const emptyPolygonState: PolygonLegacyStateV1 = {
   polygonid: {
     eth: {
       main: cloneDeep(emptyPolygonBaseState),
+      goerli: cloneDeep(emptyPolygonBaseState),
       mumbai: cloneDeep(emptyPolygonBaseState), // To satisfy the type checker
     },
     polygon: {
       main: cloneDeep(emptyPolygonBaseState),
+      goerli: cloneDeep(emptyPolygonBaseState),
       mumbai: cloneDeep(emptyPolygonBaseState),
     },
   },
   iden3: {
     eth: {
       main: cloneDeep(emptyPolygonBaseState),
+      goerli: cloneDeep(emptyPolygonBaseState),
       mumbai: cloneDeep(emptyPolygonBaseState), // To satisfy the type checker
     },
     polygon: {
       main: cloneDeep(emptyPolygonBaseState),
+      goerli: cloneDeep(emptyPolygonBaseState),
       mumbai: cloneDeep(emptyPolygonBaseState),
     },
   },

diff --git a/packages/types/src/legacy/stateV1.ts b/packages/types/src/legacy/stateV1.ts
@@ -72,6 +72,9 @@ export type PolygonLegacyStateV1 = Record<
   DidMethod.Iden3 | DidMethod.PolygonId,
   Record<
     Blockchain.Ethereum | Blockchain.Polygon,
-    Record<NetworkId.Main | NetworkId.Mumbai, PolygonLegacyBaseStateV1>
+    Record<
+      NetworkId.Main | NetworkId.Goerli | NetworkId.Mumbai,
+      PolygonLegacyBaseStateV1
+    >
   >
 >;