@subwallet/extension-base 1.1.25-0 → 1.1.26-0

package/background/KoniTypes.d.ts

@@ -12,7 +12,7 @@ import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
 import { KeyringAddress, KeyringPairs$Json } from '@subwallet/ui-keyring/types';
 import { SessionTypes } from '@walletconnect/types/dist/types/sign-client/session';
-import { DexieExportJsonMeta } from 'dexie-export-import';
+import { DexieExportJsonStructure } from 'dexie-export-import';
 import Web3 from 'web3';
 import { RequestArguments, TransactionConfig } from 'web3-core';
 import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
@@ -1784,7 +1784,7 @@ export interface KoniRequestSignatures {
     'pri(buyService.services.subscribe)': [null, Record<string, BuyServiceInfo>, Record<string, BuyServiceInfo>];
     'pri(database.export)': [null, string];
     'pri(database.import)': [string, boolean];
-    'pri(database.checkMetadata)': [string, DexieExportJsonMeta];
+    'pri(database.exportJson)': [null, DexieExportJsonStructure];
 }
 export interface ApplicationMetadataType {
     version: string;

package/background/handlers/State.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { DEFAULT_SETTING } from '@subwallet/extension-base/services/setting-service/constants';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
 import { stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -92,7 +93,7 @@ export default class State {
     extractMetadata(this.#metaStore);
 
     // retrieve previously set authorizations
-    const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
+    const authString = SWStorage.instance.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);
     this.#authUrls = previousAuth;
   }
@@ -231,7 +232,7 @@ export default class State {
     };
   };
   saveCurrentAuthList() {
-    localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
+    SWStorage.instance.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
   }
   metaComplete = (id, resolve, reject) => {
     const complete = () => {

package/cjs/background/handlers/State.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.NotificationOptions = void 0;
 var _constants = require("@subwallet/extension-base/services/setting-service/constants");
+var _storage = require("@subwallet/extension-base/storage");
 var _Settings = _interopRequireDefault(require("@subwallet/extension-base/stores/Settings"));
 var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
@@ -108,7 +109,7 @@ class State {
     extractMetadata(this.#metaStore);
 
     // retrieve previously set authorizations
-    const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
+    const authString = _storage.SWStorage.instance.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);
     this.#authUrls = previousAuth;
   }
@@ -257,7 +258,7 @@ class State {
     };
   };
   saveCurrentAuthList() {
-    localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
+    _storage.SWStorage.instance.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
   }
   metaComplete = (id, resolve, reject) => {
     const complete = () => {

package/cjs/constants/staking.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PREDEFINED_STAKING_POOL = void 0;
+exports.PREDEFINED_STAKING_POOL = exports.MAX_NOMINATIONS = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -12,4 +12,6 @@ const PREDEFINED_STAKING_POOL = {
   polkadot: 39,
   vara_network: 29
 };
-exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
+exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
+const MAX_NOMINATIONS = '16';
+exports.MAX_NOMINATIONS = MAX_NOMINATIONS;

package/cjs/koni/api/dotsama/transfer.js

@@ -164,9 +164,9 @@ const createTransferExtrinsic = async _ref => {
     }
   } else if (_constants._TRANSFER_CHAIN_GROUP.pendulum.includes(networkKey) && isTxTokensSupported && !(0, _utils2._isNativeToken)(tokenInfo)) {
     if (transferAll) {
-      transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), false);
+      transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), false);
     } else if (value) {
-      transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), new _util.BN(value));
+      transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo), new _util.BN(value));
     }
   } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
   // && isTxEqBalancesSupported

package/cjs/koni/api/nft/config.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.W3S_IPFS = exports.VARA_SCAN_ENDPOINT = exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SUBWALLET_IPFS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_IO = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.IPFS_ETH_ARAGON = exports.IPFS2_RMRK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
+var _storage = require("@subwallet/extension-base/storage");
 var _utils = require("@subwallet/extension-base/utils");
 var _bowser = _interopRequireDefault(require("bowser"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -70,7 +71,7 @@ exports.IPFS_ETH_ARAGON = IPFS_ETH_ARAGON;
 const SUBWALLET_IPFS = 'https://ipfs.subwallet.app/ipfs/'; // ???
 exports.SUBWALLET_IPFS = SUBWALLET_IPFS;
 const detectFirefox = () => {
-  return (localStorage.getItem('browserInfo') || _bowser.default.getParser(window.navigator.userAgent).getBrowserName()).toLowerCase() === 'firefox';
+  return (_storage.SWStorage.instance.getItem('browserInfo') || _bowser.default.getParser(window.navigator.userAgent).getBrowserName()).toLowerCase() === 'firefox';
 };
 const isFirefox = detectFirefox();
 let SUPPORTED_NFT_NETWORKS;

package/cjs/koni/api/staking/bonding/relayChain.js

@@ -25,8 +25,9 @@ exports.validateRelayBondingCondition = validateRelayBondingCondition;
 exports.validateRelayUnbondingCondition = validateRelayUnbondingCondition;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
-var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -105,7 +106,7 @@ function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, callback) {
   return substrateApi.api.query.staking.currentEra(async _currentEra => {
     var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6, _substrateApi$api$que7;
     const currentEra = _currentEra.toString();
-    const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16'; // TODO
+    const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || _constants.MAX_NOMINATIONS; // TODO
     const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
     const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
     const [_totalEraStake, _totalIssuance, _auctionCounter, _minNominatorBond, _minPoolJoin, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.erasTotalStake(parseInt(currentEra)), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que = substrateApi.api.query.auctions) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.auctionCounter(), substrateApi.api.query.staking.minNominatorBond(), (_substrateApi$api$que2 = substrateApi.api.query) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.nominationPools) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.minJoinBond(), ((_substrateApi$api$que4 = substrateApi.api.query) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.staking) === null || _substrateApi$api$que5 === void 0 ? void 0 : _substrateApi$api$que5.minimumActiveStake) && ((_substrateApi$api$que6 = substrateApi.api.query) === null || _substrateApi$api$que6 === void 0 ? void 0 : (_substrateApi$api$que7 = _substrateApi$api$que6.staking) === null || _substrateApi$api$que7 === void 0 ? void 0 : _substrateApi$api$que7.minimumActiveStake())]);
@@ -122,12 +123,12 @@ function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, callback) {
     const inflation = (0, _utils.calculateInflation)(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
     const expectedReturn = (0, _utils.calculateChainStakedReturn)(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
     const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
-    const unlockingPeriod = parseInt(unlockingEras) * (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default); // in hours
+    const unlockingPeriod = parseInt(unlockingEras) * (_constants2._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants2._STAKING_ERA_LENGTH_MAP.default); // in hours
 
     callback(chainInfo.slug, {
       chain: chainInfo.slug,
       type: _KoniTypes.StakingType.NOMINATED,
-      expectedReturn: !_constants._STAKING_CHAIN_GROUP.ternoa.includes(chainInfo.slug) ? expectedReturn : undefined,
+      expectedReturn: !_constants2._STAKING_CHAIN_GROUP.ternoa.includes(chainInfo.slug) ? expectedReturn : undefined,
       // in %, annually
       inflation,
       era: parseInt(currentEra),
@@ -177,13 +178,13 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   const bnTotalIssuance = new _util.BN(rawTotalIssuance);
   const inflation = (0, _utils.calculateInflation)(bnTotalEraStake, bnTotalIssuance, numAuctions, chain);
   const expectedReturn = (0, _utils.calculateChainStakedReturn)(inflation, bnTotalEraStake, bnTotalIssuance, chain);
-  const unlockingPeriod = parseInt(unlockingEras) * _constants._STAKING_ERA_LENGTH_MAP[chain]; // in hours
+  const unlockingPeriod = parseInt(unlockingEras) * _constants2._STAKING_ERA_LENGTH_MAP[chain]; // in hours
 
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
     era: parseInt(currentEra),
-    expectedReturn: !_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain) ? expectedReturn : undefined,
+    expectedReturn: !_constants2._STAKING_CHAIN_GROUP.ternoa.includes(chain) ? expectedReturn : undefined,
     // in %, annually
     inflation,
     minStake: minStake.toString(),
@@ -196,16 +197,17 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   };
 }
 async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrateApi, ledger) {
-  var _chainApi$api$query4, _chainApi$api$query4$, _chainApi$api$query5, _chainApi$api$query5$, _chainApi$api$query6, _chainApi$api$query6$, _chainApi$api$query7, _chainApi$api$query7$, _chainApi$api$query8, _chainApi$api$query8$, _chainApi$api$query9, _chainApi$api$query9$;
+  var _chainApi$api$query4, _chainApi$api$query4$, _chainApi$api$query5, _chainApi$api$query5$, _chainApi$api$query6, _chainApi$api$query6$, _chainApi$api$query7, _chainApi$api$query7$, _chainApi$api$query8, _chainApi$api$query8$, _chainApi$api$query9, _chainApi$api$query9$, _chainApi$api$derive, _chainApi$api$derive$;
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
-  const [_nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_chainApi$api$query4 = chainApi.api.query) === null || _chainApi$api$query4 === void 0 ? void 0 : (_chainApi$api$query4$ = _chainApi$api$query4.staking) === null || _chainApi$api$query4$ === void 0 ? void 0 : _chainApi$api$query4$.nominators(address), (_chainApi$api$query5 = chainApi.api.query) === null || _chainApi$api$query5 === void 0 ? void 0 : (_chainApi$api$query5$ = _chainApi$api$query5.staking) === null || _chainApi$api$query5$ === void 0 ? void 0 : _chainApi$api$query5$.currentEra(), (_chainApi$api$query6 = chainApi.api.query) === null || _chainApi$api$query6 === void 0 ? void 0 : (_chainApi$api$query6$ = _chainApi$api$query6.staking) === null || _chainApi$api$query6$ === void 0 ? void 0 : _chainApi$api$query6$.bonded(address), ((_chainApi$api$query7 = chainApi.api.query) === null || _chainApi$api$query7 === void 0 ? void 0 : (_chainApi$api$query7$ = _chainApi$api$query7.staking) === null || _chainApi$api$query7$ === void 0 ? void 0 : _chainApi$api$query7$.minimumActiveStake) && ((_chainApi$api$query8 = chainApi.api.query) === null || _chainApi$api$query8 === void 0 ? void 0 : (_chainApi$api$query8$ = _chainApi$api$query8.staking) === null || _chainApi$api$query8$ === void 0 ? void 0 : _chainApi$api$query8$.minimumActiveStake()), (_chainApi$api$query9 = chainApi.api.query) === null || _chainApi$api$query9 === void 0 ? void 0 : (_chainApi$api$query9$ = _chainApi$api$query9.staking) === null || _chainApi$api$query9$ === void 0 ? void 0 : _chainApi$api$query9$.minNominatorBond()]);
+  const [_nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond, _deriveSessionProgress] = await Promise.all([(_chainApi$api$query4 = chainApi.api.query) === null || _chainApi$api$query4 === void 0 ? void 0 : (_chainApi$api$query4$ = _chainApi$api$query4.staking) === null || _chainApi$api$query4$ === void 0 ? void 0 : _chainApi$api$query4$.nominators(address), (_chainApi$api$query5 = chainApi.api.query) === null || _chainApi$api$query5 === void 0 ? void 0 : (_chainApi$api$query5$ = _chainApi$api$query5.staking) === null || _chainApi$api$query5$ === void 0 ? void 0 : _chainApi$api$query5$.currentEra(), (_chainApi$api$query6 = chainApi.api.query) === null || _chainApi$api$query6 === void 0 ? void 0 : (_chainApi$api$query6$ = _chainApi$api$query6.staking) === null || _chainApi$api$query6$ === void 0 ? void 0 : _chainApi$api$query6$.bonded(address), ((_chainApi$api$query7 = chainApi.api.query) === null || _chainApi$api$query7 === void 0 ? void 0 : (_chainApi$api$query7$ = _chainApi$api$query7.staking) === null || _chainApi$api$query7$ === void 0 ? void 0 : _chainApi$api$query7$.minimumActiveStake) && ((_chainApi$api$query8 = chainApi.api.query) === null || _chainApi$api$query8 === void 0 ? void 0 : (_chainApi$api$query8$ = _chainApi$api$query8.staking) === null || _chainApi$api$query8$ === void 0 ? void 0 : _chainApi$api$query8$.minimumActiveStake()), (_chainApi$api$query9 = chainApi.api.query) === null || _chainApi$api$query9 === void 0 ? void 0 : (_chainApi$api$query9$ = _chainApi$api$query9.staking) === null || _chainApi$api$query9$ === void 0 ? void 0 : _chainApi$api$query9$.minNominatorBond(), (_chainApi$api$derive = chainApi.api.derive) === null || _chainApi$api$derive === void 0 ? void 0 : (_chainApi$api$derive$ = _chainApi$api$derive.session) === null || _chainApi$api$derive$ === void 0 ? void 0 : _chainApi$api$derive$.progress()]);
   const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
   const minNominatorBond = _minNominatorBond.toString();
   const bnMinActiveStake = new _util.BN(minActiveStake);
   const bnMinNominatorBond = new _util.BN(minNominatorBond);
   const minStake = bnMinActiveStake.gt(bnMinNominatorBond) ? bnMinActiveStake : bnMinNominatorBond;
-  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
+  const _maxNominatorRewardedPerValidator = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
   const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
   const nominations = _nominations.toPrimitive();
   const currentEra = _currentEra.toString();
@@ -228,7 +230,7 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
       if (!topNominators.includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if nominator has target but not in nominator list
         nominationStatus = _KoniTypes.StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
+      } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if address in top nominators
         nominationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
       }
@@ -259,9 +261,17 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
+    // Calculate the remaining era
     const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
     const remainingEra = unlockingChunk.era - parseInt(currentEra);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
+
+    // Calculate the remaining time for current era ending
+    const expectedBlockTime = _constants2._EXPECTED_BLOCK_TIME[chain];
+    const eraLength = _deriveSessionProgress.eraLength.toNumber();
+    const eraProgress = _deriveSessionProgress.eraProgress.toNumber();
+    const remainingSlots = eraLength - eraProgress;
+    const remainingHours = expectedBlockTime * remainingSlots / 60 / 60;
+    const waitingTime = remainingEra * _constants2._STAKING_ERA_LENGTH_MAP[chain] + remainingHours;
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
@@ -297,7 +307,8 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   const bnMinActiveStake = new _util.BN(minActiveStake);
   const bnMinNominatorBond = new _util.BN(minNominatorBond);
   const minStake = bnMinActiveStake.gt(bnMinNominatorBond) ? bnMinActiveStake : bnMinNominatorBond;
-  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
+  const _maxNominatorRewardedPerValidator = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
   const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
   const ledger = _ledger.toPrimitive();
   const nominations = _nominations.toPrimitive();
@@ -332,7 +343,7 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
       if (!topNominators.includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if nominator has target but not in nominator list
         nominationStatus = _KoniTypes.StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
+      } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if address in top nominators
         nominationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
       }
@@ -365,7 +376,7 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   ledger.unlocking.forEach(unlockingChunk => {
     const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
     const remainingEra = unlockingChunk.era - parseInt(currentEra);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
+    const waitingTime = remainingEra * _constants2._STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
@@ -385,11 +396,13 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   };
 }
 async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substrateApi, poolMemberInfo) {
-  const _maxNominatorRewardedPerValidator = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  var _substrateApi$api$der, _substrateApi$api$der2;
+  const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
+  const _maxNominatorRewardedPerValidator = (substrateApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
   const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
   const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
   const poolStashAccount = (0, _utils.parsePoolStashAddress)(substrateApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
-  const [_nominations, _poolMetadata, _currentEra] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.metadata(poolMemberInfo.poolId), substrateApi.api.query.staking.currentEra()]);
+  const [_nominations, _poolMetadata, _currentEra, _deriveSessionProgress] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.metadata(poolMemberInfo.poolId), substrateApi.api.query.staking.currentEra(), (_substrateApi$api$der = substrateApi.api.derive) === null || _substrateApi$api$der === void 0 ? void 0 : (_substrateApi$api$der2 = _substrateApi$api$der.session) === null || _substrateApi$api$der2 === void 0 ? void 0 : _substrateApi$api$der2.progress()]);
   const poolMetadata = _poolMetadata.toPrimitive();
   const currentEra = _currentEra.toString();
   const nominations = _nominations.toJSON();
@@ -413,7 +426,7 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
       });
       const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
-      }).slice(0, maxNominatorRewardedPerValidator);
+      }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes((0, _utils3.reformatAddress)(poolStashAccount, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if address in top nominators
         stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
@@ -434,7 +447,15 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
     let [unlockingEra, amount] = _ref;
     const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
     const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+    // const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+
+    // Calculate the remaining time for current era ending
+    const expectedBlockTime = _constants2._EXPECTED_BLOCK_TIME[chainInfo.slug];
+    const eraLength = _deriveSessionProgress.eraLength.toNumber();
+    const eraProgress = _deriveSessionProgress.eraProgress.toNumber();
+    const remainingSlots = eraLength - eraProgress;
+    const remainingHours = expectedBlockTime * remainingSlots / 60 / 60;
+    const waitingTime = remainingEra * _constants2._STAKING_ERA_LENGTH_MAP[chainInfo.slug] + remainingHours;
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
@@ -464,7 +485,8 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
 async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const [_poolMemberInfo, _currentEra] = await Promise.all([chainApi.api.query.nominationPools.poolMembers(address), chainApi.api.query.staking.currentEra()]);
-  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
+  const _maxNominatorRewardedPerValidator = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
   const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
   const poolsPalletId = chainApi.api.consts.nominationPools.palletId.toString();
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
@@ -506,7 +528,7 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
       });
       const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
-      }).slice(0, maxNominatorRewardedPerValidator);
+      }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes((0, _utils3.reformatAddress)(poolStashAccount, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if address in top nominators
         stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
@@ -527,7 +549,7 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
     let [unlockingEra, amount] = _ref2;
     const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
     const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+    const waitingTime = remainingEra * _constants2._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
@@ -559,7 +581,8 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   const validatorInfoList = [];
   const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s2 = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s2 === void 0 ? void 0 : _chainApi$api$query$s2.data) && chainApi.api.query.stakingRewards.data()]);
   const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
-  const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
+  const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
   const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
   const eraStakers = _eraStakers;
   const rawMinBond = _minBond.toHuman();
@@ -596,7 +619,7 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
       blocked: false,
       isVerified: false,
       minBond,
-      isCrowded: nominatorCount > parseInt(maxNominatorRewarded)
+      isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
     });
   }
   const extraInfoMap = {};
@@ -615,9 +638,9 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   for (const validator of validatorInfoList) {
     const commission = extraInfoMap[validator.address].commission;
     const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-    if (_constants._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+    if (_constants2._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
       validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(chainStakingMetadata.expectedReturn, (0, _utils.getCommission)(commission));
-    } else if (_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+    } else if (_constants2._STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
       const rewardPerValidator = new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
       const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
       validator.expectedReturn = (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, (0, _utils.getCommission)(commission));

package/cjs/koni/api/xcm/xTokens.js

@@ -25,6 +25,6 @@ function getCurrencyId(tokenInfo) {
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/cjs/koni/background/handlers/Extension.js

@@ -1043,21 +1043,24 @@ class KoniExtension {
     });
     return this.getPrice();
   }
-  getBalance(reset) {
+  async getBalance(reset) {
     return this.#koniState.getBalance(reset);
   }
-  subscribeBalance(id, port) {
+  async subscribeBalance(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const balanceSubscription = this.#koniState.subscribeBalance().subscribe({
       next: rs => {
-        cb(rs);
+        const data = {
+          details: rs
+        };
+        cb(data);
       }
     });
     this.createUnsubscriptionHandle(id, balanceSubscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return this.getBalance(true);
+    return await this.getBalance(true);
   }
   getCrowdloan(reset) {
     return this.#koniState.getCrowdloan(reset);
@@ -3832,9 +3835,9 @@ class KoniExtension {
       case 'pri(price.getSubscription)':
         return await this.subscribePrice(id, port);
       case 'pri(balance.getBalance)':
-        return this.getBalance();
+        return await this.getBalance();
       case 'pri(balance.getSubscription)':
-        return this.subscribeBalance(id, port);
+        return await this.subscribeBalance(id, port);
       case 'pri(crowdloan.getCrowdloan)':
         return this.getCrowdloan();
       case 'pri(crowdloan.getSubscription)':
@@ -4170,8 +4173,8 @@ class KoniExtension {
         return this.#koniState.dbService.exportDB();
       case 'pri(database.import)':
         return this.#koniState.dbService.importDB(request);
-      case 'pri(database.checkMetadata)':
-        return this.#koniState.dbService.checkImportMetadata(request);
+      case 'pri(database.exportJson)':
+        return this.#koniState.dbService.getExportJson();
       /* Database */
       // Default
       default:

package/cjs/koni/background/handlers/Mobile.js

@@ -4,10 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+exports.isIndexedDBReset = isIndexedDBReset;
+exports.isLocalStorageReset = isLocalStorageReset;
+exports.isWebRunnerDataReset = isWebRunnerDataReset;
+var _index = require("@subwallet/extension-base/koni/background/handlers/index");
+var _storage = require("@subwallet/extension-base/storage");
+var _utils = require("@subwallet/extension-base/utils");
 var _promise = require("@subwallet/extension-base/utils/promise");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+function isLocalStorageReset() {
+  var _window;
+  if ((_window = window) !== null && _window !== void 0 && _window.localStorage) {
+    return !window.localStorage.getItem('keyring:subwallet');
+  } else {
+    return false;
+  }
+}
+async function isIndexedDBReset() {
+  try {
+    return (await _index.state.dbService.stores.migration.table.count()) < 1;
+  } catch (e) {
+    return true;
+  }
+}
+
+// Detect problems on the web-runner
+async function isWebRunnerDataReset() {
+  return isLocalStorageReset() || (await isIndexedDBReset());
+}
+const swStorage = _storage.SWStorage.instance;
 const DEFAULT_SERVICE_MAP = {
   subscription: {
     chainRegistry: true,
@@ -28,8 +55,17 @@ class Mobile {
   // @ts-ignore
 
   restoreHandler = (0, _promise.createPromiseHandler)();
+  lastRestoreData = {};
   constructor(state) {
     this.state = state;
+    if (!isLocalStorageReset()) {
+      this.lastRestoreData.storage = swStorage.copy();
+    }
+    (async () => {
+      if (!(await isIndexedDBReset())) {
+        this.lastRestoreData.indexedDB = await state.dbService.getExportJson();
+      }
+    })().catch(console.error);
   }
   ping() {
     return 'mobile:ping';
@@ -104,25 +140,65 @@ class Mobile {
   restartSubscriptionServices(services) {
     console.log('restartSubscriptionServices');
   }
-  async mobileBackup() {
+  async _getLocalStorageExportData() {
+    return Promise.resolve(JSON.stringify(swStorage.copy()));
+  }
+  async _getDexieExportData() {
     const indexedDB = await this.state.dbService.exportDB();
+    if ((await isIndexedDBReset()) && this.lastRestoreData.indexedDB) {
+      // Merge with latest restore DexieData
+      const exportData = await this.state.dbService.getExportJson();
+      const exportTables = exportData === null || exportData === void 0 ? void 0 : exportData.data.data;
+      const existedData = this.lastRestoreData.indexedDB;
+      const existedTableMap = Object.fromEntries(existedData.data.data.map(table => [table.tableName, table]));
+      if ((exportTables === null || exportTables === void 0 ? void 0 : exportTables.length) > 0) {
+        exportTables.forEach(_ref5 => {
+          let {
+            inbound,
+            rows,
+            tableName
+          } = _ref5;
+          const latestTable = existedTableMap[tableName];
+
+          // chain & asset & campaign
+          if (tableName === 'chain' || tableName === 'asset' || tableName === 'campaign') {
+            latestTable.rows = (0, _utils.listMerge)('slug', latestTable.rows, rows);
+
+            // Todo: Campaign still doesn't work
+          } else if (tableName === 'migrations') {
+            latestTable.rows = (0, _utils.listMerge)('key', latestTable.rows, rows);
+          } else if (tableName === 'transactions') {
+            latestTable.rows = (0, _utils.listMerge)(['chain', 'address', 'extrinsicHash'], latestTable.rows, rows);
+          }
+        });
+      }
+      return JSON.stringify(existedData);
+    }
+    return indexedDB;
+  }
+  async mobileBackup() {
+    const storage = await this._getLocalStorageExportData();
+    const indexedDB = await this._getDexieExportData();
     return {
-      storage: JSON.stringify(localStorage),
+      storage,
       indexedDB
     };
   }
-  async mobileRestore(_ref5) {
+  async mobileRestore(_ref6) {
     let {
       indexedDB,
       storage
-    } = _ref5;
+    } = _ref6;
     if (storage) {
       const storageData = JSON.parse(storage);
       for (const key in storageData) {
-        localStorage.setItem(key, storageData[key]);
+        swStorage.setItem(key, storageData[key]);
       }
     }
     if (indexedDB) {
+      // Backup the last restore data to memory
+      this.lastRestoreData.indexedDB = JSON.parse(indexedDB);
+      // Backup the last restore data to memory
       await this.state.dbService.importDB(indexedDB);
     }
     this.restoreHandler.resolve();