@subwallet/extension-base 1.1.25-1 → 1.1.27-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.25-1",
+  "version": "1.1.27-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -510,6 +510,11 @@
       "require": "./cjs/services/balance-service/index.js",
       "default": "./services/balance-service/index.js"
     },
+    "./services/balance-service/BalanceMapImpl": {
+      "types": "./services/balance-service/BalanceMapImpl.d.ts",
+      "require": "./cjs/services/balance-service/BalanceMapImpl.js",
+      "default": "./services/balance-service/BalanceMapImpl.js"
+    },
     "./services/balance-service/helpers/group": {
       "types": "./services/balance-service/helpers/group.d.ts",
       "require": "./cjs/services/balance-service/helpers/group.js",
@@ -838,6 +843,16 @@
       "require": "./cjs/services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js",
       "default": "./services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js"
     },
+    "./services/migration-service/scripts/tokens/MigratePolygonUSDCProvider": {
+      "types": "./services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.js",
+      "default": "./services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.js"
+    },
+    "./services/migration-service/scripts/tokens/MigrateToken": {
+      "types": "./services/migration-service/scripts/tokens/MigrateToken.d.ts",
+      "require": "./cjs/services/migration-service/scripts/tokens/MigrateToken.js",
+      "default": "./services/migration-service/scripts/tokens/MigrateToken.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -1153,6 +1168,11 @@
       "require": "./cjs/signers/web3/QrSigner.js",
       "default": "./signers/web3/QrSigner.js"
     },
+    "./storage": {
+      "types": "./storage/index.d.ts",
+      "require": "./cjs/storage/index.js",
+      "default": "./storage/index.js"
+    },
     "./stores": {
       "types": "./stores/index.d.ts",
       "require": "./cjs/stores/index.js",
@@ -1346,34 +1366,34 @@
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.9.1",
-    "@polkadot/api-contract": "^10.9.1",
-    "@polkadot/api-derive": "^10.9.1",
-    "@polkadot/apps-config": "^0.132.1",
-    "@polkadot/hw-ledger": "^12.3.2",
-    "@polkadot/networks": "^12.3.2",
-    "@polkadot/phishing": "^0.21.5",
-    "@polkadot/rpc-provider": "^10.9.1",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/types-augment": "^10.9.1",
-    "@polkadot/ui-settings": "^3.5.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2",
+    "@polkadot/api": "^10.11.1",
+    "@polkadot/api-contract": "^10.11.1",
+    "@polkadot/api-derive": "^10.11.1",
+    "@polkadot/apps-config": "^0.133.1",
+    "@polkadot/hw-ledger": "^12.6.1",
+    "@polkadot/networks": "^12.6.1",
+    "@polkadot/phishing": "^0.22.1",
+    "@polkadot/rpc-provider": "^10.11.1",
+    "@polkadot/types": "^10.11.1",
+    "@polkadot/types-augment": "^10.11.1",
+    "@polkadot/ui-settings": "^3.6.4",
+    "@polkadot/util": "^12.6.1",
+    "@polkadot/util-crypto": "^12.6.1",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.29",
-    "@subwallet/extension-base": "^1.1.25-1",
-    "@subwallet/extension-chains": "^1.1.25-1",
-    "@subwallet/extension-dapp": "^1.1.25-1",
-    "@subwallet/extension-inject": "^1.1.25-1",
+    "@subwallet/chain-list": "^0.2.30",
+    "@subwallet/extension-base": "^1.1.27-0",
+    "@subwallet/extension-chains": "^1.1.27-0",
+    "@subwallet/extension-dapp": "^1.1.27-0",
+    "@subwallet/extension-inject": "^1.1.27-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^2.8.4",
     "avail-js-sdk": "^0.0.10",
-    "axios": "^1.2.1",
+    "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.25-1'
+  version: '1.1.27-0'
 };

package/services/balance-service/BalanceMapImpl.d.ts

@@ -0,0 +1,17 @@
+import { BalanceInfo, BalanceItem, BalanceMap } from '@subwallet/extension-base/types';
+import { BehaviorSubject } from 'rxjs';
+export declare class BalanceMapImpl {
+    private _map;
+    private _mapSubject;
+    constructor(_map?: BalanceMap);
+    get map(): BalanceMap;
+    get mapSubject(): BehaviorSubject<BalanceMap>;
+    setData(map: BalanceMap): void;
+    setAddressData(address: string, data: BalanceInfo): void;
+    triggerChange(computeAll?: boolean): void;
+    updateBalanceItem(balanceItem: BalanceItem, trigger?: boolean): void;
+    updateBalanceItems(balanceItems: BalanceItem[], computeAll?: boolean): void;
+    removeBalanceItemByFilter(filter: (balanceItem: BalanceItem) => boolean): void;
+    computeAllAccountBalance(): void;
+    removeBalanceItems(addresses?: string[], tokenSlugs?: string[]): void;
+}

package/services/balance-service/BalanceMapImpl.js

@@ -0,0 +1,101 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
+import { groupBalance } from '@subwallet/extension-base/services/balance-service/helpers/group';
+import { isAccountAll } from '@subwallet/extension-base/utils';
+import { BehaviorSubject } from 'rxjs';
+export class BalanceMapImpl {
+  constructor(_map = {}) {
+    this._map = _map;
+    this._mapSubject = new BehaviorSubject(_map);
+  }
+  get map() {
+    return this._mapSubject.getValue();
+  }
+  get mapSubject() {
+    return this._mapSubject;
+  }
+  setData(map) {
+    this._map = map;
+    this.triggerChange();
+  }
+  setAddressData(address, data) {
+    this._map[address] = data;
+    this.triggerChange();
+  }
+  triggerChange(computeAll) {
+    if (computeAll) {
+      this.computeAllAccountBalance();
+    }
+    this._mapSubject.next(this._map);
+  }
+  updateBalanceItem(balanceItem, trigger = false) {
+    const {
+      address,
+      tokenSlug
+    } = balanceItem;
+    if (!this._map[address]) {
+      this._map[address] = {};
+    }
+    this._map[address][tokenSlug] = balanceItem;
+    trigger && this.triggerChange();
+  }
+  updateBalanceItems(balanceItems, computeAll) {
+    balanceItems.forEach(balanceItem => {
+      this.updateBalanceItem(balanceItem);
+    });
+    this.triggerChange(computeAll);
+  }
+  removeBalanceItemByFilter(filter) {
+    Object.keys(this._map).forEach(address => {
+      Object.keys(this._map[address]).forEach(tokenSlug => {
+        if (filter(this._map[address][tokenSlug])) {
+          delete this._map[address][tokenSlug];
+        }
+      });
+    });
+    this.triggerChange();
+  }
+  computeAllAccountBalance() {
+    const allAccountBalanceInfo = {};
+    const allAccountBalance = {};
+    Object.keys(this._map).filter(a => !isAccountAll(a)).forEach(address => {
+      Object.keys(this._map[address]).forEach(tokenSlug => {
+        if (!allAccountBalance[tokenSlug]) {
+          allAccountBalance[tokenSlug] = [];
+        }
+        allAccountBalance[tokenSlug].push(this._map[address][tokenSlug]);
+      });
+    });
+    Object.entries(allAccountBalance).forEach(([tokenSlug, balanceItems]) => {
+      allAccountBalanceInfo[tokenSlug] = groupBalance(balanceItems, ALL_ACCOUNT_KEY, tokenSlug);
+    });
+    this._map[ALL_ACCOUNT_KEY] = allAccountBalanceInfo;
+  }
+
+  // Remove balance items buy address or tokenSlug
+  removeBalanceItems(addresses, tokenSlugs) {
+    // If addresses is empty, remove all
+    if (addresses && tokenSlugs) {
+      addresses.forEach(address => {
+        tokenSlugs.forEach(tokenSlug => {
+          this._map[address] && this._map[address][tokenSlug] && delete this._map[address][tokenSlug];
+        });
+      });
+    } else if (addresses && !tokenSlugs) {
+      addresses.forEach(address => {
+        this._map[address] && delete this._map[address];
+      });
+    } else if (!addresses && tokenSlugs) {
+      Object.keys(this._map).forEach(address => {
+        tokenSlugs.forEach(tokenSlug => {
+          this._map[address][tokenSlug] && delete this._map[address][tokenSlug];
+        });
+      });
+    } else {
+      this._map = {};
+    }
+    this.triggerChange();
+  }
+}

package/services/campaign-service/index.d.ts

@@ -3,6 +3,7 @@ import KoniState from '@subwallet/extension-base/koni/background/handlers/State'
 export default class CampaignService {
     #private;
     constructor(state: KoniState);
+    init(): void;
     private fetchCampaign;
     private runCampaign;
     getProcessingCampaign(): Promise<CampaignData[]>;

package/services/campaign-service/index.js

@@ -9,6 +9,8 @@ export default class CampaignService {
   #state;
   constructor(state) {
     this.#state = state;
+  }
+  init() {
     this.fetchCampaign().catch(e => {
       console.error('Error on fetch campaigns', e);
     });

package/services/chain-service/constants.d.ts

@@ -45,6 +45,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     ternoa: string[];
 };
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
+export declare const _EXPECTED_BLOCK_TIME: Record<string, number>;
 export declare const _PARACHAIN_INFLATION_DISTRIBUTION: Record<string, Record<string, number>>;
 export interface _SubstrateInflationParams {
     auctionAdjust: number;

package/services/chain-service/constants.js

@@ -98,6 +98,22 @@ export const _STAKING_ERA_LENGTH_MAP = {
   vara_network: 12,
   goldberg_testnet: 24
 };
+export const _EXPECTED_BLOCK_TIME = {
+  // in seconds
+  alephTest: 1,
+  aleph: 1,
+  polkadot: 6,
+  kusama: 6,
+  polkadex: 12,
+  ternoa: 6,
+  ternoa_alphanet: 6,
+  westend: 6,
+  kate: 20,
+  edgeware: 6,
+  creditcoin: 12,
+  vara_network: 3,
+  goldberg_testnet: 20
+};
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {
     // https://docs.moonbeam.network/learn/features/staking/#annual-inflation
@@ -192,7 +208,7 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
 export const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
 export const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
@@ -200,7 +216,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
-  pendulum: ['pendulum', 'amplitude', 'amplitude_test'],
+  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
   centrifuge: ['centrifuge']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {

package/services/event-service/index.d.ts

@@ -1,7 +1,6 @@
 import { EventItem, EventRegistry, EventType } from '@subwallet/extension-base/services/event-service/types';
 import EventEmitter from 'eventemitter3';
 export declare class EventService extends EventEmitter<EventRegistry> {
-    private lazyTime;
     private timeoutId;
     private pendingEvents;
     private lazyEmitter;
@@ -15,9 +14,7 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitCampaignReady: Promise<boolean>;
     readonly waitBuyTokenReady: Promise<boolean>;
     readonly waitBuyServiceReady: Promise<boolean>;
-    constructor(options?: {
-        lazyTime: number;
-    });
+    constructor();
     private generateWaitPromise;
     private setLazyTimeout;
     private emitLazy;

package/services/event-service/index.js

@@ -4,14 +4,14 @@
 // Stateless service handle runtime event on background
 
 import EventEmitter from 'eventemitter3';
+const DEFAULT_LAZY_TIME = 300;
+const LONG_LAZY_TIME = 900;
+const LONG_LAZY_EVENTS = ['account.add', 'chain.add'];
 export class EventService extends EventEmitter {
   pendingEvents = [];
   lazyEmitter = new EventEmitter();
-  constructor(options = {
-    lazyTime: 300
-  }) {
+  constructor() {
     super();
-    this.lazyTime = options.lazyTime;
     this.timeoutId = null;
     this.waitCryptoReady = this.generateWaitPromise('crypto.ready');
     this.waitDatabaseReady = this.generateWaitPromise('database.ready');
@@ -31,13 +31,14 @@ export class EventService extends EventEmitter {
       });
     });
   }
-  setLazyTimeout() {
+  setLazyTimeout(eventType) {
     if (this.timeoutId) {
       clearTimeout(this.timeoutId);
     }
+    const timeout = LONG_LAZY_EVENTS.includes(eventType) ? LONG_LAZY_TIME : DEFAULT_LAZY_TIME;
     this.timeoutId = setTimeout(() => {
       this.emitLazy();
-    }, this.lazyTime);
+    }, timeout);
   }
   emitLazy() {
     try {
@@ -63,7 +64,7 @@ export class EventService extends EventEmitter {
       type: eventType,
       data: args
     });
-    this.setLazyTimeout();
+    this.setLazyTimeout(eventType);
     return super.emit(eventType, ...args);
   }
 }

package/services/event-service/types.js

@@ -1,6 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-export const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add', 'mantaPay.initSync',
+export const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'account.add', 'account.remove', 'asset.updateState', 'chain.updateState', 'chain.add', 'mantaPay.initSync',
 // TODO: re-check this
 'mantaPay.enable'];

package/services/history-service/index.js

@@ -240,6 +240,7 @@ export class HistoryService {
   startPromiseHandler = createPromiseHandler();
   async init() {
     this.status = ServiceStatus.INITIALIZING;
+    await this.eventService.waitCryptoReady;
     await this.loadData();
     Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
       this.getHistories().catch(console.log);

package/services/keyring-service/index.js

@@ -22,10 +22,12 @@ export class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
-    this.currentAccountStore.get('CurrentAccountInfo', rs => {
-      rs && this.currentAccountSubject.next(rs);
-    });
-    this.subscribeAccounts().catch(console.error);
+    this.eventService.waitCryptoReady.then(() => {
+      this.currentAccountStore.get('CurrentAccountInfo', rs => {
+        rs && this.currentAccountSubject.next(rs);
+      });
+      this.subscribeAccounts().catch(console.error);
+    }).catch(console.error);
   }
   async subscribeAccounts() {
     // Wait until account ready
@@ -65,8 +67,10 @@ export class KeyringService {
   updateKeyringState(isReady = true) {
     var _keyring$keyring, _keyring$keyring2;
     if (!this.keyringState.isReady && isReady) {
-      this.eventService.emit('keyring.ready', true);
-      this.eventService.emit('account.ready', true);
+      this.eventService.waitCryptoReady.then(() => {
+        this.eventService.emit('keyring.ready', true);
+        this.eventService.emit('account.ready', true);
+      }).catch(console.error);
     }
     this.keyringStateSubject.next({
       hasMasterPassword: !!((_keyring$keyring = keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),

package/services/migration-service/scripts/index.js

@@ -4,6 +4,7 @@
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
+import MigratePolygonUSDCProvider from "./tokens/MigratePolygonUSDCProvider.js";
 import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
 import DeleteChain from "./DeleteChain.js";
 import EnableVaraChain from "./EnableVaraChain.js";
@@ -34,6 +35,7 @@ export default {
   '1.1.13-01': MigrateTokenDecimals,
   '1.1.17-01': MigratePioneerProvider,
   '1.1.17-03': EnableVaraChain,
-  '1.1.24-01': MigrateProvidersV1M1P24
+  '1.1.24-01': MigrateProvidersV1M1P24,
+  '1.1.26-01': MigratePolygonUSDCProvider
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.d.ts

@@ -0,0 +1,5 @@
+import MigrateToken from './MigrateToken';
+export default class MigratePolygonUSDCProvider extends MigrateToken {
+    oldToken: string;
+    newTokens: string[];
+}

package/services/migration-service/scripts/tokens/MigratePolygonUSDCProvider.js

@@ -0,0 +1,8 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import MigrateToken from "./MigrateToken.js";
+export default class MigratePolygonUSDCProvider extends MigrateToken {
+  oldToken = 'polygon-ERC20-USDC-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174';
+  newTokens = ['polygon-ERC20-USDC.e-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', 'polygon-ERC20-USDC-0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'];
+}

package/services/migration-service/scripts/tokens/MigrateToken.d.ts

@@ -0,0 +1,9 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+/**
+ * @description Enable `newTokens` if `oldToken` active
+ * */
+export default abstract class MigrateToken extends BaseMigrationJob {
+    abstract oldToken: string;
+    abstract newTokens: string[];
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/tokens/MigrateToken.js

@@ -0,0 +1,26 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+
+/**
+ * @description Enable `newTokens` if `oldToken` active
+ * */
+export default class MigrateToken extends BaseMigrationJob {
+  async run() {
+    const state = this.state;
+    const assetSettings = await state.chainService.getAssetSettings();
+    const oldAssetSetting = assetSettings[this.oldToken];
+    if (oldAssetSetting) {
+      if (oldAssetSetting.visible) {
+        for (const newToken of this.newTokens) {
+          assetSettings[newToken] = {
+            visible: true
+          };
+        }
+      }
+      delete assetSettings[this.oldToken];
+      state.chainService.setAssetSettings(assetSettings);
+    }
+  }
+}

package/services/setting-service/SettingService.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { LANGUAGE } from '@subwallet/extension-base/constants';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import PassPhishingStore from '@subwallet/extension-base/stores/PassPhishingStore';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
 import i18n from "./i18n/i18n.js";
@@ -10,7 +11,7 @@ export default class SettingService {
   settingsStore = new SettingsStore();
   passPhishingStore = new PassPhishingStore();
   constructor() {
-    let old = localStorage.getItem(LANGUAGE) || 'en';
+    let old = SWStorage.instance.getItem(LANGUAGE) || 'en';
     const updateLanguage = ({
       language
     }) => {

package/services/setting-service/i18n/i18n.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { LANGUAGE } from '@subwallet/extension-base/constants';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import i18next from 'i18next';
 import Backend from "./Backend.js";
 i18next.use(Backend).init({
@@ -12,7 +13,7 @@ i18next.use(Backend).init({
     escapeValue: false
   },
   keySeparator: false,
-  lng: localStorage.getItem(LANGUAGE) || 'en',
+  lng: SWStorage.instance.getItem(LANGUAGE) || 'en',
   load: 'languageOnly',
   nsSeparator: false,
   returnEmptyString: false,

package/services/storage-service/DatabaseService.d.ts

@@ -10,6 +10,8 @@ import NominatorMetadataStore from '@subwallet/extension-base/services/storage-s
 import { HistoryQuery } from '@subwallet/extension-base/services/storage-service/db-stores/Transaction';
 import { BalanceItem } from '@subwallet/extension-base/types';
 import { Subscription } from 'dexie';
+import { DexieExportJsonStructure } from 'dexie-export-import';
+export declare const DEXIE_BACKUP_TABLES: string[];
 export default class DatabaseService {
     private eventService;
     private _db;
@@ -87,5 +89,5 @@ export default class DatabaseService {
     upsertCampaign(campaign: ICampaign): import("dexie").PromiseExtended<unknown>;
     exportDB(): Promise<string>;
     importDB(data: string): Promise<boolean>;
-    checkImportMetadata(data: string): Promise<import("dexie-export-import").DexieExportJsonMeta | null>;
+    getExportJson(): Promise<DexieExportJsonStructure>;
 }

package/services/storage-service/DatabaseService.js

@@ -9,9 +9,9 @@ import ChainStakingMetadataStore from '@subwallet/extension-base/services/storag
 import MantaPayStore from '@subwallet/extension-base/services/storage-service/db-stores/MantaPay';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
 import { reformatAddress } from '@subwallet/extension-base/utils';
-import { exportDB, peakImportFile } from 'dexie-export-import';
+import { exportDB } from 'dexie-export-import';
 import { logger as createLogger } from '@polkadot/util';
-const EXPORT_EXCLUDE_TABLES = ['metadata'];
+export const DEXIE_BACKUP_TABLES = ['chain', 'asset', 'migrations', 'transactions', 'campaign'];
 export default class DatabaseService {
   // TODO: might remove this
 
@@ -289,10 +289,7 @@ export default class DatabaseService {
   async exportDB() {
     const blob = await exportDB(this._db, {
       filter: (table, value, key) => {
-        if (EXPORT_EXCLUDE_TABLES.indexOf(table) >= 0) {
-          return false;
-        }
-        return true;
+        return DEXIE_BACKUP_TABLES.indexOf(table) >= 0;
       }
     });
     return await blob.text();
@@ -303,9 +300,8 @@ export default class DatabaseService {
         type: 'application/json'
       });
       await this._db.import(blob, {
-        overwriteValues: true,
-        acceptMissingTables: true,
-        acceptVersionDiff: true
+        clearTablesBeforeImport: true,
+        acceptMissingTables: true
       });
       return true;
     } catch (e) {
@@ -313,15 +309,7 @@ export default class DatabaseService {
       return false;
     }
   }
-  async checkImportMetadata(data) {
-    try {
-      const blob = new Blob([data], {
-        type: 'application/json'
-      });
-      return await peakImportFile(blob);
-    } catch (e) {
-      this.logger.error(e);
-      return null;
-    }
+  async getExportJson() {
+    return JSON.parse(await this.exportDB());
   }
 }

package/services/storage-service/db-stores/Balance.d.ts

@@ -1,7 +1,8 @@
-import { BalanceMap } from '@subwallet/extension-base/types';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import { IBalance } from '../databases';
 import BaseStoreWithAddress from '../db-stores/BaseStoreWithAddress';
 export default class BalanceStore extends BaseStoreWithAddress<IBalance> {
-    getBalanceMapByAddresses(addresses: string): Promise<BalanceMap>;
+    getBalanceMapByAddresses(addresses: string): Promise<BalanceItem[]>;
     removeBySlugs(tokenSlugs: string[]): Promise<number>;
+    removeByAddresses(addresses: string[]): Promise<number>;
 }

package/services/storage-service/db-stores/Balance.js

@@ -4,21 +4,12 @@
 import BaseStoreWithAddress from "./BaseStoreWithAddress.js";
 export default class BalanceStore extends BaseStoreWithAddress {
   async getBalanceMapByAddresses(addresses) {
-    const data = await this.table.where('address').anyOf(addresses).toArray();
-    const balanceMap = {};
-    data.forEach(storedBalance => {
-      const address = storedBalance.address;
-      const slug = storedBalance.tokenSlug;
-      if (!balanceMap[address]) {
-        balanceMap[address] = {};
-      }
-      balanceMap[address][slug] = {
-        ...storedBalance
-      };
-    });
-    return balanceMap;
+    return this.table.where('address').anyOf(addresses).toArray();
   }
   async removeBySlugs(tokenSlugs) {
     return this.table.where('tokenSlug').anyOfIgnoreCase(tokenSlugs).delete();
   }
+  async removeByAddresses(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).delete();
+  }
 }