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

package/cjs/services/keyring-service/index.js

@@ -28,10 +28,12 @@ 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
@@ -72,8 +74,10 @@ class KeyringService {
     var _keyring$keyring, _keyring$keyring2;
     let isReady = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     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 = _uiKeyring.keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),

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

@@ -8,6 +8,7 @@ exports.default = exports.EVERYTIME = void 0;
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
+var _MigratePolygonUSDCProvider = _interopRequireDefault(require("./tokens/MigratePolygonUSDCProvider"));
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
 var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
@@ -42,7 +43,8 @@ var _default = {
   '1.1.13-01': _MigrateTokenDecimals.default,
   '1.1.17-01': _MigratePioneerProvider.default,
   '1.1.17-03': _EnableVaraChain.default,
-  '1.1.24-01': _MigrateProvidersV1M1P.default
+  '1.1.24-01': _MigrateProvidersV1M1P.default,
+  '1.1.26-01': _MigratePolygonUSDCProvider.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _MigrateToken = _interopRequireDefault(require("./MigrateToken"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigratePolygonUSDCProvider extends _MigrateToken.default {
+  oldToken = 'polygon-ERC20-USDC-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174';
+  newTokens = ['polygon-ERC20-USDC.e-0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', 'polygon-ERC20-USDC-0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359'];
+}
+exports.default = MigratePolygonUSDCProvider;

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @description Enable `newTokens` if `oldToken` active
+ * */
+class MigrateToken extends _Base.default {
+  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);
+    }
+  }
+}
+exports.default = MigrateToken;

package/cjs/services/setting-service/SettingService.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _storage = require("@subwallet/extension-base/storage");
 var _PassPhishingStore = _interopRequireDefault(require("@subwallet/extension-base/stores/PassPhishingStore"));
 var _Settings = _interopRequireDefault(require("@subwallet/extension-base/stores/Settings"));
 var _i18n = _interopRequireDefault(require("./i18n/i18n"));
@@ -17,7 +18,7 @@ class SettingService {
   settingsStore = new _Settings.default();
   passPhishingStore = new _PassPhishingStore.default();
   constructor() {
-    let old = localStorage.getItem(_constants.LANGUAGE) || 'en';
+    let old = _storage.SWStorage.instance.getItem(_constants.LANGUAGE) || 'en';
     const updateLanguage = _ref => {
       let {
         language

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _storage = require("@subwallet/extension-base/storage");
 var _i18next = _interopRequireDefault(require("i18next"));
 var _Backend = _interopRequireDefault(require("./Backend"));
 // Copyright 2019-2022 @polkadot/extension-ui authors & contributors
@@ -19,7 +20,7 @@ _i18next.default.use(_Backend.default).init({
     escapeValue: false
   },
   keySeparator: false,
-  lng: localStorage.getItem(_constants.LANGUAGE) || 'en',
+  lng: _storage.SWStorage.instance.getItem(_constants.LANGUAGE) || 'en',
   load: 'languageOnly',
   nsSeparator: false,
   returnEmptyString: false,

package/cjs/services/storage-service/DatabaseService.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.DEXIE_BACKUP_TABLES = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _databases = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/databases"));
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
@@ -18,7 +18,8 @@ var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const EXPORT_EXCLUDE_TABLES = ['metadata'];
+const DEXIE_BACKUP_TABLES = ['chain', 'asset', 'migrations', 'transactions', 'campaign'];
+exports.DEXIE_BACKUP_TABLES = DEXIE_BACKUP_TABLES;
 class DatabaseService {
   // TODO: might remove this
 
@@ -297,10 +298,7 @@ class DatabaseService {
   async exportDB() {
     const blob = await (0, _dexieExportImport.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();
@@ -311,9 +309,8 @@ class DatabaseService {
         type: 'application/json'
       });
       await this._db.import(blob, {
-        overwriteValues: true,
-        acceptMissingTables: true,
-        acceptVersionDiff: true
+        clearTablesBeforeImport: true,
+        acceptMissingTables: true
       });
       return true;
     } catch (e) {
@@ -321,16 +318,8 @@ class DatabaseService {
       return false;
     }
   }
-  async checkImportMetadata(data) {
-    try {
-      const blob = new Blob([data], {
-        type: 'application/json'
-      });
-      return await (0, _dexieExportImport.peakImportFile)(blob);
-    } catch (e) {
-      this.logger.error(e);
-      return null;
-    }
+  async getExportJson() {
+    return JSON.parse(await this.exportDB());
   }
 }
 exports.default = DatabaseService;

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

@@ -11,22 +11,13 @@ var _BaseStoreWithAddress = _interopRequireDefault(require("../db-stores/BaseSto
 
 class BalanceStore extends _BaseStoreWithAddress.default {
   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();
+  }
 }
 exports.default = BalanceStore;

package/cjs/services/wallet-connect-service/index.js

@@ -9,6 +9,7 @@ var _classPrivateFieldLooseBase2 = _interopRequireDefault(require("@babel/runtim
 var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldLooseKey"));
 var _utils = require("@json-rpc-tools/utils");
 var _Eip155RequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service/handler/Eip155RequestHandler"));
+var _storage = require("@subwallet/extension-base/storage");
 var _signClient = _interopRequireDefault(require("@walletconnect/sign-client"));
 var _utils2 = require("@walletconnect/utils");
 var _rxjs = require("rxjs");
@@ -18,6 +19,8 @@ var _helpers = require("./helpers");
 var _types = require("./types");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
+const storage = _storage.SWStorage.instance;
 var _requestService = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("eip155RequestHandler");
@@ -193,9 +196,9 @@ class WalletConnectService {
 }
 exports.default = WalletConnectService;
 function _get_haveData() {
-  const sessionStorage = localStorage.getItem('wc@2:client:0.3//session');
-  const pairingStorage = localStorage.getItem('wc@2:core:0.3//pairing');
-  const subscriptionStorage = localStorage.getItem('wc@2:core:0.3//subscription');
+  const sessionStorage = storage.getItem('wc@2:client:0.3//session');
+  const pairingStorage = storage.getItem('wc@2:core:0.3//pairing');
+  const subscriptionStorage = storage.getItem('wc@2:core:0.3//subscription');
   const sessions = sessionStorage ? JSON.parse(sessionStorage) : [];
   const pairings = pairingStorage ? JSON.parse(pairingStorage) : [];
   const subscriptions = subscriptionStorage ? JSON.parse(subscriptionStorage) : [];

package/cjs/storage/index.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SWStorage = void 0;
+// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class SWStorage {
+  _storage = {};
+  constructor() {
+    this.sync();
+  }
+  setItem(key, value) {
+    this._storage[key] = value;
+    localStorage.setItem(key, value);
+  }
+  getItem(key) {
+    return this._storage[key] || localStorage.getItem(key) || null;
+  }
+  removeItem(key) {
+    this._storage[key] && delete this._storage[key];
+    localStorage.removeItem(key);
+  }
+  clear() {
+    this._storage = {};
+    localStorage.clear();
+  }
+  key(index) {
+    return Object.keys(this._storage)[index] || null;
+  }
+  length(index) {
+    return Object.keys(this._storage)[index] || null;
+  }
+
+  // Additional methods
+  keys() {
+    return Object.keys(this._storage) || [];
+  }
+  copy() {
+    return JSON.parse(JSON.stringify(this._storage));
+  }
+  sync() {
+    this._storage = JSON.parse(JSON.stringify(localStorage));
+  }
+  static get instance() {
+    // @ts-ignore
+    if (!window.SWStorage) {
+      console.log('SWStorage init');
+      // @ts-ignore
+      window.SWStorage = new SWStorage();
+    }
+
+    // @ts-ignore
+    return window.SWStorage;
+  }
+}
+exports.SWStorage = SWStorage;

package/cjs/utils/array.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.listMerge = listMerge;
 exports.uniqueStringArray = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -14,4 +15,29 @@ const uniqueStringArray = array => {
   });
   return Object.keys(map);
 };
-exports.uniqueStringArray = uniqueStringArray;
+exports.uniqueStringArray = uniqueStringArray;
+function listMerge(keys, existed, newItems) {
+  const getKey = (ks, item) => {
+    if (typeof ks === 'string') {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
+      return item[ks].toString();
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
+    return ks.map(k => item[k].toString()).join('_');
+  };
+
+  // Build existed map with keys
+  const existedMap = Object.fromEntries(existed.map(v => {
+    return [getKey(keys, v), v];
+  }));
+  newItems.forEach(item => {
+    const key = getKey(keys, item);
+    if (existedMap[key]) {
+      Object.assign(existedMap[key], item);
+    } else {
+      existed.push(item);
+    }
+  });
+  return existed;
+}

package/constants/staking.d.ts

@@ -1 +1,2 @@
 export declare const PREDEFINED_STAKING_POOL: Record<string, number>;
+export declare const MAX_NOMINATIONS = "16";

package/constants/staking.js

@@ -5,4 +5,5 @@ export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
   vara_network: 29
-};
+};
+export const MAX_NOMINATIONS = '16';

package/koni/api/dotsama/transfer.js

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

package/koni/api/nft/config.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { SWStorage } from '@subwallet/extension-base/storage';
 import { RuntimeInfo } from '@subwallet/extension-base/utils';
 import Bowser from 'bowser';
 export const SINGULAR_V1_ENDPOINT = 'https://singular.rmrk-api.xyz/api/account-rmrk1/';
@@ -36,7 +37,7 @@ export const IPFS_ETH_ARAGON = 'https://ipfs.eth.aragon.network/ipfs/'; // 400
 export const SUBWALLET_IPFS = 'https://ipfs.subwallet.app/ipfs/'; // ???
 
 const detectFirefox = () => {
-  return (localStorage.getItem('browserInfo') || Bowser.getParser(window.navigator.userAgent).getBrowserName()).toLowerCase() === 'firefox';
+  return (SWStorage.instance.getItem('browserInfo') || Bowser.getParser(window.navigator.userAgent).getBrowserName()).toLowerCase() === 'firefox';
 };
 const isFirefox = detectFirefox();
 export let SUPPORTED_NFT_NETWORKS;

package/koni/api/staking/bonding/astar.js

@@ -8,6 +8,18 @@ import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
+const convertAddress = address => {
+  return isEthereumAddress(address) ? address.toLowerCase() : address;
+};
+const fetchDApps = async network => {
+  return new Promise(function (resolve) {
+    fetch(`https://api.astar.network/api/v1/${network}/dapps-staking/dappssimple`, {
+      method: 'GET'
+    }).then(resp => {
+      resolve(resp.json());
+    }).catch(console.error);
+  });
+};
 export function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.dappsStaking.currentEra(_currentEra => {
     const era = _currentEra.toString();
@@ -63,19 +75,10 @@ export async function getAstarStakingMetadata(chain, substrateApi) {
     unstakingPeriod
   };
 }
-const convertAddress = address => {
-  return isEthereumAddress(address) ? address.toLowerCase() : address;
-};
 export async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi, ledger) {
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${chainInfo.slug}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chainInfo.slug);
   const [_allDapps, _era, _stakerInfo] = await Promise.all([allDappsReq, substrateApi.api.query.dappsStaking.currentEra(), substrateApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const currentEra = _era.toString();
   const minDelegatorStake = substrateApi.api.consts.dappsStaking.minimumStakingAmount.toString();
@@ -160,13 +163,7 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
   const chainApi = await substrateApi.isReady;
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${chain}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chain);
   const [_ledger, _era, _stakerInfo] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra(), chainApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const ledger = _ledger.toPrimitive();
   const currentEra = _era.toString();
@@ -245,13 +242,7 @@ export async function getAstarDappsInfo(networkKey, substrateApi) {
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
   const allDappsInfo = [];
   const maxStakerPerContract = parseRawNumber(rawMaxStakerPerContract);
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${networkKey}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(networkKey);
   const [_era, _allDapps] = await Promise.all([chainApi.api.query.dappsStaking.currentEra(), allDappsReq]);
   const era = parseRawNumber(_era.toHuman());
   const allDapps = _allDapps;

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

@@ -3,8 +3,9 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { MAX_NOMINATIONS } from '@subwallet/extension-base/constants';
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, parseIdentity, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
-import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _EXPECTED_BLOCK_TIME, _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -80,7 +81,7 @@ export function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, call
   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()) || 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())]);
@@ -171,16 +172,17 @@ export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   };
 }
 export 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 BN(minActiveStake);
   const bnMinNominatorBond = new 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();
@@ -203,7 +205,7 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if nominator has target but not in nominator list
         nominationStatus = StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
+      } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
         nominationStatus = StakingStatus.EARNING_REWARD;
       }
@@ -234,9 +236,17 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
+    // Calculate the remaining era
     const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
     const remainingEra = unlockingChunk.era - parseInt(currentEra);
-    const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
+
+    // Calculate the remaining time for current era ending
+    const expectedBlockTime = _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 * _STAKING_ERA_LENGTH_MAP[chain] + remainingHours;
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
@@ -272,7 +282,8 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   const bnMinActiveStake = new BN(minActiveStake);
   const bnMinNominatorBond = new 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();
@@ -307,7 +318,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if nominator has target but not in nominator list
         nominationStatus = StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
+      } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
         nominationStatus = StakingStatus.EARNING_REWARD;
       }
@@ -360,11 +371,13 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   };
 }
 export 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 = 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();
@@ -388,7 +401,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
       });
       const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
-      }).slice(0, maxNominatorRewardedPerValidator);
+      }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
         stakingStatus = StakingStatus.EARNING_REWARD;
@@ -408,7 +421,15 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
     const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
     const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
-    const waitingTime = remainingEra * _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 = _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 * _STAKING_ERA_LENGTH_MAP[chainInfo.slug] + remainingHours;
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
@@ -438,7 +459,8 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
 export 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();
@@ -480,7 +502,7 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
       });
       const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
-      }).slice(0, maxNominatorRewardedPerValidator);
+      }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
         stakingStatus = StakingStatus.EARNING_REWARD;
@@ -532,7 +554,8 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
   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 BN(_totalEraStake.toString());
   const eraStakers = _eraStakers;
   const rawMinBond = _minBond.toHuman();
@@ -569,7 +592,7 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
       blocked: false,
       isVerified: false,
       minBond,
-      isCrowded: nominatorCount > parseInt(maxNominatorRewarded)
+      isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
     });
   }
   const extraInfoMap = {};