fix: default migrate data

onbloc · Feb 27, 2025 · be392cb · be392cb
1 parent 0696133
commit be392cb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/packages/adena-extension/src/common/storage/chrome-local-storage.ts b/packages/adena-extension/src/common/storage/chrome-local-storage.ts
@@ -99,16 +99,20 @@ export class ChromeLocalStorage implements Storage {
   };
 
   private setStorageData = async (key: string, value: any): Promise<void> => {
-    if (this.current === null) {
+    this.current = await this.getStorageData();
+    if (!this.current) {
       return;
     }
+
     const storageData = {
       ...this.current,
       data: {
         ...this.current.data,
         [key]: value,
       },
     };
+
+    this.current = storageData;
     await this.storage.set({
       [ChromeLocalStorage.StorageKey]: JSON.stringify(storageData),
     });

diff --git a/packages/adena-extension/src/migrates/storage-migrator.ts b/packages/adena-extension/src/migrates/storage-migrator.ts
@@ -15,7 +15,7 @@ import { StorageModelV007 } from './migrations/v007/storage-model-v007';
 import { StorageMigration008 } from './migrations/v008/storage-migration-v008';
 import { StorageModelV008 } from './migrations/v008/storage-model-v008';
 import { StorageMigration009 } from './migrations/v009/storage-migration-v009';
-import { StorageModelV009 } from './migrations/v009/storage-model-v009';
+import { StorageModelDataV009, StorageModelV009 } from './migrations/v009/storage-model-v009';
 import { Migration, Migrator } from './migrator';
 
 const LegacyStorageKeys = [
@@ -48,6 +48,24 @@ const defaultData: StorageModelDataV001 = {
   ACCOUNT_TOKEN_METAINFOS: {},
 };
 
+const defaultLegacyData: StorageModelDataV009 = {
+  NETWORKS: [],
+  CURRENT_CHAIN_ID: '',
+  CURRENT_NETWORK_ID: '',
+  SERIALIZED: '',
+  ENCRYPTED_STORED_PASSWORD: '',
+  CURRENT_ACCOUNT_ID: '',
+  ACCOUNT_NAMES: {},
+  ESTABLISH_SITES: {},
+  ADDRESS_BOOK: '',
+  ACCOUNT_TOKEN_METAINFOS: {},
+  QUESTIONNAIRE_EXPIRED_DATE: 0,
+  WALLET_CREATION_GUIDE_CONFIRM_DATE: 0,
+  ADD_ACCOUNT_GUIDE_CONFIRM_DATE: 0,
+  ACCOUNT_GRC721_COLLECTIONS: {},
+  ACCOUNT_GRC721_PINNED_PACKAGES: {},
+};
+
 // Storage interface with set and get methods
 interface Storage {
   set(items: { [key: string]: any }): Promise<void>;
@@ -123,9 +141,10 @@ export class StorageMigrator implements Migrator {
     if (data) {
       return data;
     }
+
     return {
-      version: 1,
-      data: defaultData,
+      version: 9,
+      data: defaultLegacyData,
     };
   }
 
@@ -210,16 +229,19 @@ export class StorageMigrator implements Migrator {
       return json as StorageModelV001;
     }
 
-    let data = defaultData;
     const isLegacy = await this.storage.get('SERIALIZED');
-    if (isLegacy) {
-      data = await this.getLegacyData();
+    if (Object.keys(isLegacy).length > 0) {
+      const data = await this.getLegacyData();
+      return {
+        version: 1,
+        data,
+      } as StorageModelV001;
     }
 
     return {
-      version: 1,
-      data,
-    } as StorageModelV001;
+      version: 9,
+      data: defaultLegacyData,
+    } as StorageModelV009;
   }
 
   private async getLegacyData(): Promise<StorageModelDataV001> {