@subwallet/extension-base 1.1.58-0 → 1.1.60-0

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.58-0'
+  version: '1.1.60-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -60,7 +60,13 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
     if (_constants2._BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
       unsubBridgedToken = await subscribeBridgedBalance(substrateParams);
     }
-    if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
+
+    /**
+     * Some substrate chain use evm account format but not have evm connection and support ERC20 contract,
+     * so we need to check if the chain is compatible with EVM and support ERC20
+     * */
+    if ((0, _utils2._isChainEvmCompatible)(chainInfo) && (0, _utils2._getTokenTypesSupportedByChain)(chainInfo).includes(_types._AssetType.ERC20)) {
+      // Get sub-token for EVM-compatible chains
       unsubEvmContractToken = (0, _evm.subscribeERC20Interval)({
         ...baseParams,
         evmApi: evmApi

package/cjs/services/chain-service/constants.js

@@ -103,7 +103,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   manta_network: 6,
   krest_network: 4,
   polimec: 6,
-  enjin_relaychain: 24
+  enjin_relaychain: 24,
+  availTuringTest: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {
@@ -133,7 +134,8 @@ const _EXPECTED_BLOCK_TIME = {
   calamari: 12,
   calamari_test: 12,
   manta_network: 12,
-  enjin_relaychain: 6
+  enjin_relaychain: 6,
+  availTuringTest: 20
 };
 exports._EXPECTED_BLOCK_TIME = _EXPECTED_BLOCK_TIME;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

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

@@ -667,7 +667,12 @@ class ChainService {
         this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
       }
     }
-    if (chainInfo.evmInfo !== null && chainInfo.evmInfo !== undefined) {
+
+    /**
+     * To check if the chain is EVM chain, we need to check if the chain has evmInfo and evmChainId is not -1
+     * (fake evm chain to connect to substrate chain)
+     * */
+    if (chainInfo.evmInfo !== null && chainInfo.evmInfo !== undefined && chainInfo.evmInfo.evmChainId !== -1) {
       const chainApi = await this.evmChainHandler.initApi(chainInfo.slug, endpoint, {
         providerName,
         onUpdateStatus

package/cjs/services/chain-service/utils/index.js

@@ -13,6 +13,7 @@ var _exportNames = {
   _isPureSubstrateChain: true,
   _getOriginChainOfAsset: true,
   _getContractAddressOfToken: true,
+  _isNativeTokenTransferredByEvm: true,
   _isTokenTransferredByEvm: true,
   _checkSmartContractSupportByChain: true,
   _getTokenOnChainAssetId: true,
@@ -132,6 +133,7 @@ exports._isLocalToken = _isLocalToken;
 exports._isMantaZkAsset = _isMantaZkAsset;
 exports._isNativeToken = _isNativeToken;
 exports._isNativeTokenBySlug = _isNativeTokenBySlug;
+exports._isNativeTokenTransferredByEvm = _isNativeTokenTransferredByEvm;
 exports._isPureEvmChain = _isPureEvmChain;
 exports._isPureSubstrateChain = _isPureSubstrateChain;
 exports._isSmartContractToken = _isSmartContractToken;
@@ -229,9 +231,27 @@ function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
-function _isTokenTransferredByEvm(tokenInfo) {
+
+/**
+ * @function _isNativeTokenTransferredByEvm
+ * @description Check if the native token is transferred by EVM, some token is only transferred by Substrate, need to check disableEvmTransfer flag
+ * @param {_ChainAsset} tokenInfo - The token info object
+ * @returns {boolean} - Return true if the native token can transfer by EVM
+ * */
+function _isNativeTokenTransferredByEvm(tokenInfo) {
   var _tokenInfo$metadata2;
-  return !!((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.contractAddress) || _isNativeToken(tokenInfo);
+  return !((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.disableEvmTransfer);
+}
+
+/**
+ * @function _isTokenTransferredByEvm
+ * @description Check if the token is transferred by EVM
+ * @param {_ChainAsset} tokenInfo - The token info object
+ * @returns {boolean} - Return true if the token can transfer by EVM
+ * */
+function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata3;
+  return !!((_tokenInfo$metadata3 = tokenInfo.metadata) !== null && _tokenInfo$metadata3 !== void 0 && _tokenInfo$metadata3.contractAddress) || _isNativeToken(tokenInfo) && _isNativeTokenTransferredByEvm(tokenInfo);
 }
 function _checkSmartContractSupportByChain(chainInfo, contractType) {
   // EVM chains support smart contract by default so just checking Substrate chains
@@ -243,16 +263,16 @@ function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 function _getTokenOnChainAssetId(tokenInfo) {
-  var _tokenInfo$metadata3;
-  return ((_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.assetId) || '-1';
+  var _tokenInfo$metadata4;
+  return ((_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.assetId) || '-1';
 }
 function _getTokenOnChainInfo(tokenInfo) {
-  var _tokenInfo$metadata4;
-  return (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.onChainInfo;
+  var _tokenInfo$metadata5;
+  return (_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.onChainInfo;
 }
 function _isBridgedToken(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return (_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.isBridged;
+  var _tokenInfo$metadata6;
+  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.isBridged;
 }
 function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -407,16 +427,16 @@ function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, assetRefMap)
   return assetRef.path === _types._AssetRefPath.XCM;
 }
 function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetType) || '';
+  var _tokenInfo$metadata7;
+  return ((_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.assetType) || '';
 }
 function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata7;
-  return ((_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.assetId) || '-1';
+  var _tokenInfo$metadata8;
+  return ((_tokenInfo$metadata8 = tokenInfo.metadata) === null || _tokenInfo$metadata8 === void 0 ? void 0 : _tokenInfo$metadata8.assetId) || '-1';
 }
 function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata8;
-  return (_tokenInfo$metadata8 = tokenInfo.metadata) === null || _tokenInfo$metadata8 === void 0 ? void 0 : _tokenInfo$metadata8.multilocation;
+  var _tokenInfo$metadata9;
+  return (_tokenInfo$metadata9 = tokenInfo.metadata) === null || _tokenInfo$metadata9 === void 0 ? void 0 : _tokenInfo$metadata9.multilocation;
 }
 function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

package/cjs/services/earning-service/constants/chains.js

@@ -8,13 +8,13 @@ exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewar
 // SPDX-License-Identifier: Apache-2.0
 
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
-  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -64,9 +64,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
-      const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
+      const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from babe.epochDuration * blockTime * staking.sessionsPerEra
 
-      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras));
+      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
       const [_EraStakeInfo, _totalIssuance, _auctionCounter, _minNominatorBond, _counterForNominators, _minimumActiveStake, ..._eraReward] = await Promise.all([substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), substrateApi.api.query.staking.minNominatorBond(), substrateApi.api.query.staking.counterForNominators(), ((_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.staking) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minimumActiveStake) && ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.staking) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.minimumActiveStake()), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
@@ -151,7 +151,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         let nominationStatus = _types.EarningStatus.NOT_EARNING;
         let eraStakerOtherList = [];
         let identity;
-        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+        if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
           // todo: review all relaychains later
           const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
           identity = _identity;
@@ -305,7 +305,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const endEraForPoints = parseInt(activeEra) - 1;
     let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
     let _eraStakersPromise;
-    if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+    if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
       // todo: review all relaychains later
       _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
     } else {

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -89,7 +89,7 @@ class NominationPoolHandler extends _base.default {
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
       const erasPerDay = 24 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from epochDuration, blockTime, sessionsPerEra
 
-      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras));
+      const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
       const [_EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), (_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
@@ -167,7 +167,7 @@ class NominationPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+        if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
           // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
           eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);

package/cjs/services/price-service/coingecko.js

@@ -4,49 +4,68 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTokenPrice = void 0;
+exports.getPriceMap = exports.getExchangeRateMap = void 0;
+var _staticData = require("@subwallet/extension-base/utils/staticData");
 var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
-const getTokenPrice = async function (priceIds) {
-  let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'usd';
+const getExchangeRateMap = async () => {
   try {
-    var _res;
-    const idStr = Array.from(priceIds).join(',');
-    let res;
-    if (!useBackupApi) {
-      try {
-        res = await _axios.default.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=250&ids=${idStr}`);
-      } catch (err) {
-        useBackupApi = true;
+    const responseDataExchangeRate = (await _axios.default.get('https://api-cache.subwallet.app/exchange-rate')).data || {};
+    const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
+      if (!_staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
+        return map;
       }
-    }
-    if (useBackupApi || ((_res = res) === null || _res === void 0 ? void 0 : _res.status) !== 200) {
+      map[exchangeKey] = {
+        exchange: responseDataExchangeRate.conversion_rates[exchangeKey],
+        label: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][exchangeKey].label
+      };
+      return map;
+    }, {});
+    return exchangeRateMap;
+  } catch (e) {
+    console.warn('Failed to get exchange rate');
+    return {};
+  }
+};
+exports.getExchangeRateMap = getExchangeRateMap;
+const getPriceMap = async function (priceIds) {
+  var _rs, _rs2, _rs3;
+  let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'USD';
+  const idStr = Array.from(priceIds).join(',');
+  let rs;
+  if (!useBackupApi) {
+    try {
+      rs = await _axios.default.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
+    } catch (err) {
       useBackupApi = true;
-      res = await _axios.default.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
     }
-    if (res.status !== 200) {
-      console.warn('Failed to get token price');
-    }
-    const responseData = res.data || [];
-    const priceMap = {};
-    const price24hMap = {};
-    responseData.forEach(val => {
-      const currentPrice = val.current_price || 0;
-      const price24h = currentPrice - (val.price_change_24h || 0);
-      priceMap[val.id] = currentPrice;
-      price24hMap[val.id] = price24h;
-    });
-    return {
-      currency,
-      priceMap,
-      price24hMap
-    };
-  } catch (err) {
-    console.error(err);
-    throw err;
   }
+  if (useBackupApi || ((_rs = rs) === null || _rs === void 0 ? void 0 : _rs.status) !== 200) {
+    useBackupApi = true;
+    rs = await _axios.default.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
+  }
+  if (((_rs2 = rs) === null || _rs2 === void 0 ? void 0 : _rs2.status) !== 200) {
+    console.warn('Failed to get token price');
+  }
+  const responseDataPrice = ((_rs3 = rs) === null || _rs3 === void 0 ? void 0 : _rs3.data) || [];
+  const currencyData = _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
+  const priceMap = {};
+  const price24hMap = {};
+  responseDataPrice.forEach(val => {
+    const currentPrice = val.current_price || 0;
+    const price24h = currentPrice - (val.price_change_24h || 0);
+    priceMap[val.id] = currentPrice;
+    price24hMap[val.id] = price24h;
+  });
+  return {
+    currency,
+    currencyData,
+    priceMap,
+    price24hMap
+  };
 };
-exports.getTokenPrice = getTokenPrice;
+exports.getPriceMap = getPriceMap;

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

@@ -7,27 +7,88 @@ exports.PriceService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _coingecko = require("@subwallet/extension-base/services/price-service/coingecko");
+var _storage = require("@subwallet/extension-base/storage");
+var _utils = require("@subwallet/extension-base/utils");
 var _promise = require("@subwallet/extension-base/utils/promise");
+var _staticData = require("@subwallet/extension-base/utils/staticData");
 var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_PRICE_SUBJECT = {
+  currency: DEFAULT_CURRENCY,
   ready: false,
-  currency: 'usd',
+  currencyData: {
+    label: 'United States Dollar',
+    symbol: DEFAULT_CURRENCY,
+    isPrefix: true
+  },
   priceMap: {},
-  price24hMap: {}
+  price24hMap: {},
+  exchangeRateMap: {}
 };
 class PriceService {
-  priceSubject = new _rxjs.BehaviorSubject(DEFAULT_PRICE_SUBJECT);
   priceIds = new Set();
   constructor(dbService, eventService, chainService) {
+    const currency = _storage.SWStorage.instance.getItem(_constants.CURRENCY);
+    this.currency = new _rxjs.BehaviorSubject(currency || DEFAULT_CURRENCY);
+    this.priceSubject = new _rxjs.BehaviorSubject({
+      ...DEFAULT_PRICE_SUBJECT,
+      currency: this.currency.value
+    });
+    this.rawPriceSubject = new _rxjs.BehaviorSubject({});
+    this.rawExchangeRateMap = new _rxjs.BehaviorSubject({});
     this.status = _types.ServiceStatus.NOT_INITIALIZED;
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
+    const mergeDataSubject = (0, _rxjs.merge)(this.rawPriceSubject, this.rawExchangeRateMap, this.currency);
+    const onUpdate = () => {
+      (0, _utils.addLazy)('updatePriceData', () => {
+        const priceSubjectValue = JSON.parse(JSON.stringify(this.rawPriceSubject.value));
+        const exchangeRateMapValue = JSON.parse(JSON.stringify(this.rawExchangeRateMap.value));
+        const currencyKey = this.currency.value;
+        if (Object.keys(priceSubjectValue).length === 0) {
+          return;
+        }
+        if (Object.keys(exchangeRateMapValue).length === 0) {
+          return;
+        }
+        if (currencyKey === DEFAULT_CURRENCY) {
+          this.priceSubject.next({
+            ...priceSubjectValue,
+            currency: currencyKey,
+            exchangeRateMap: exchangeRateMapValue,
+            currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey]
+          });
+        }
+        Object.keys(priceSubjectValue.price24hMap).forEach(key => {
+          priceSubjectValue.price24hMap[key] *= exchangeRateMapValue[currencyKey].exchange;
+          priceSubjectValue.priceMap[key] *= exchangeRateMapValue[currencyKey].exchange;
+        });
+        this.priceSubject.next({
+          ...priceSubjectValue,
+          currency: currencyKey,
+          exchangeRateMap: exchangeRateMapValue,
+          currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
+        });
+        this.dbService.updatePriceStore({
+          ...priceSubjectValue,
+          exchangeRateMap: exchangeRateMapValue
+        }).catch(console.error);
+      });
+    };
+    mergeDataSubject.subscribe(onUpdate);
     this.init().catch(console.error);
   }
+  async getTokenPrice(priceIds, currency, resolve, reject) {
+    await Promise.all([(0, _coingecko.getExchangeRateMap)(), (0, _coingecko.getPriceMap)(priceIds, currency)]).then(_ref => {
+      let [exchangeRateMap, priceMap] = _ref;
+      this.rawExchangeRateMap.next(exchangeRateMap);
+      this.rawPriceSubject.next(priceMap);
+    });
+  }
   async getPrice() {
     return Promise.resolve(this.priceSubject.value);
   }
@@ -38,18 +99,28 @@ class PriceService {
     const priceIdList = Object.values(this.chainService.getAssetRegistry()).map(a => a.priceId).filter(a => a);
     return new Set(priceIdList);
   }
-  refreshPriceData(priceIds) {
+  async setPriceCurrency(newCurrencyCode) {
+    if (newCurrencyCode === this.currency.value) {
+      return false;
+    }
+    this.currency.next(newCurrencyCode);
+
+    // Await 1s to get the latest exchange rate
+    await new Promise(resolve => setTimeout(resolve, 300));
+    _storage.SWStorage.instance.setItem(_constants.CURRENCY, newCurrencyCode);
+    return true;
+  }
+  refreshPriceData(priceIds, resolve, reject) {
     clearTimeout(this.refreshTimeout);
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
-    (0, _coingecko.getTokenPrice)(this.priceIds).then(rs => {
-      this.priceSubject.next({
-        ...rs,
-        ready: true
-      });
-      this.dbService.updatePriceStore(rs).catch(console.error);
-    }).catch(console.error);
+    this.getTokenPrice(this.priceIds, this.priceSubject.value.currency).then(() => {
+      resolve && resolve(true);
+    }).catch(e => {
+      console.error(e);
+      reject && reject(false);
+    });
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }
   async init() {
@@ -69,7 +140,7 @@ class PriceService {
     this.eventService.on('asset.updateState', eventHandler);
   }
   async loadData() {
-    const data = await this.dbService.getPriceStore();
+    const data = await this.dbService.getPriceStore(this.priceSubject.value.currency);
     this.priceSubject.next(data || DEFAULT_PRICE_SUBJECT);
   }
   async persistData() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = void 0;
+exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CURRENCY = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -21,6 +21,8 @@ const DEFAULT_CHAIN_PATROL_ENABLE = false;
 exports.DEFAULT_CHAIN_PATROL_ENABLE = DEFAULT_CHAIN_PATROL_ENABLE;
 const DEFAULT_LANGUAGE = 'en';
 exports.DEFAULT_LANGUAGE = DEFAULT_LANGUAGE;
+const DEFAULT_CURRENCY = 'usd';
+exports.DEFAULT_CURRENCY = DEFAULT_CURRENCY;
 const DEFAULT_SHOW_ZERO_BALANCE = true;
 exports.DEFAULT_SHOW_ZERO_BALANCE = DEFAULT_SHOW_ZERO_BALANCE;
 const DEFAULT_SHOW_BALANCE = false;
@@ -31,6 +33,7 @@ const DEFAULT_CAMERA_ENABLE = false;
 exports.DEFAULT_CAMERA_ENABLE = DEFAULT_CAMERA_ENABLE;
 const DEFAULT_SETTING = {
   language: DEFAULT_LANGUAGE,
+  currency: DEFAULT_CURRENCY,
   browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
   isShowZeroBalance: DEFAULT_SHOW_ZERO_BALANCE,
   isShowBalance: DEFAULT_SHOW_BALANCE,

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

@@ -60,10 +60,9 @@ class DatabaseService {
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
-  async getPriceStore() {
+  async getPriceStore(keyData) {
     try {
-      const rs = await this.stores.price.table.get('usd');
-      return rs;
+      return await this.stores.price.table.get(keyData || 'USD');
     } catch (e) {
       this.logger.error(e);
       return undefined;

package/cjs/utils/number.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_WEI = exports.BN_TEN = exports.BN_ONE = void 0;
+exports.toBNString = exports.formatNumber = exports.balanceNoPrefixFormater = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_WEI = exports.BN_TEN = exports.BN_ONE = void 0;
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -102,6 +102,89 @@ const balanceFormatter = (input, metadata) => {
   return int;
 };
 exports.balanceFormatter = balanceFormatter;
+const intToLocaleString = (str, separator) => str.replace(/\B(?=(\d{3})+(?!\d))/g, separator);
+const getNumberSeparators = () => {
+  // default
+  const res = {
+    decimal: '.',
+    thousand: ''
+  };
+
+  // convert a number formatted according to locale
+  const str = parseFloat('1234.56').toLocaleString();
+
+  // if the resulting number does not contain previous number
+  // (i.e. in some Arabic formats), return defaults
+  if (!str.match('1')) {
+    return res;
+  }
+
+  // get decimal and thousand separators
+  res.decimal = str.replace(/.*4(.*)5.*/, '$1');
+  res.thousand = str.replace(/.*1(.*)2.*/, '$1');
+
+  // return results
+  return res;
+};
+const balanceNoPrefixFormater = (input, metadata) => {
+  const [int, decimal] = input.split('.');
+  const {
+    thousand: thousandSeparator
+  } = getNumberSeparators();
+  const absGteOne = new _bignumber.default(input).abs().gte(1);
+  const minNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.minNumberFormat) || 2;
+  const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;
+  let _decimal = '';
+  if (absGteOne) {
+    // Get only minNumberFormat number at decimal
+    if (decimal.length <= minNumberFormat) {
+      _decimal = decimal;
+    } else {
+      _decimal = decimal.slice(0, minNumberFormat);
+    }
+
+    // Clear zero number for decimal
+    _decimal = clearZero(_decimal);
+  } else {
+    // Index of cursor
+    let index = 0;
+
+    // Count of not zero number in decimal
+    let current = 0;
+
+    // Find a not zero number in decimal
+    let metNotZero = false;
+
+    // Get at least minNumberFormat number not 0 from index 0
+    // If count of 0 number at prefix greater or equal maxNumberFormat should stop and return 0
+
+    // current === minNumberFormat: get enough number
+    // index === decimal.length: end of decimal
+    // index === maxNumberFormat: reach limit of 0 number at prefix
+    if (decimal) {
+      while (current < minNumberFormat && index < decimal.length && (index < maxNumberFormat || metNotZero)) {
+        const _char = decimal[index];
+        _decimal += _char;
+        index++;
+        if (_char !== '0') {
+          metNotZero = true;
+        }
+        if (metNotZero) {
+          current++;
+        }
+      }
+
+      // Clear zero number for decimal
+      _decimal = clearZero(_decimal);
+    }
+  }
+  const int_ = intToLocaleString(int, thousandSeparator);
+  if (_decimal) {
+    return `${int_}.${_decimal}`;
+  }
+  return int_;
+};
+exports.balanceNoPrefixFormater = balanceNoPrefixFormater;
 const PREDEFINED_FORMATTER = {
   balance: balanceFormatter
 };

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -24,12 +24,16 @@ const marketingCampaigns = require('./marketingCampaigns.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.marketingCampaigns = marketingCampaigns;
 const termAndCondition = require('./termAndCondition.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.termAndCondition = termAndCondition;
+const currencySymbol = require('./currencySymbol.json');
+exports.currencySymbol = currencySymbol;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
   StaticKey["BUY_SERVICE_INFOS"] = "buy-service-infos";
   StaticKey["CHAINS"] = "chains";
+  StaticKey["CURRENCY_SYMBOL"] = "currency_symbols";
   StaticKey["MARKETING_CAMPAINGS"] = "marketing-campaigns";
   StaticKey["CROWDLOAN_FUNDS"] = "crowdloan-funds";
   StaticKey["TERM_AND_CONDITION"] = "term-and-condition";
@@ -37,6 +41,7 @@ exports.StaticKey = StaticKey;
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
+  [StaticKey.CURRENCY_SYMBOL]: currencySymbol,
   [StaticKey.BUY_SERVICE_INFOS]: buyServiceInfos,
   [StaticKey.CROWDLOAN_FUNDS]: crowdloanFunds,
   [StaticKey.MARKETING_CAMPAINGS]: marketingCampaigns,

package/constants/staking.js

@@ -5,6 +5,7 @@ export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
   vara_network: 62,
-  aleph: 82
+  aleph: 82,
+  availTuringTest: 11
 };
 export const MAX_NOMINATIONS = '16';

package/constants/storage.d.ts

@@ -1 +1,2 @@
 export declare const LANGUAGE = "current-language";
+export declare const CURRENCY = "current-currency";