@subwallet/extension-base 1.1.59-0 → 1.1.60-1

package/koni/api/coingecko.js

@@ -1,29 +1,72 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
 import axios from 'axios';
-export const getTokenPrice = async (priceIds, currency = 'usd') => {
+let useBackupApi = false;
+export const getTokenPrice = async (priceIds, currencyCode = 'USD') => {
   try {
-    // const inverseMap: Record<string, string> = {};
-    const idStr = priceIds.join(',');
-    const res = await axios.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=1000&ids=${idStr}`);
-    const responseData = res.data;
+    var _resMultiPromise$, _resMultiPromise$2;
+    const idStr = Array.from(priceIds).join(',');
+    const getPriceMap = async () => {
+      var _rs, _rs2;
+      let rs;
+      if (!useBackupApi) {
+        try {
+          rs = await axios.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currencyCode.toLowerCase()}&per_page=250&ids=${idStr}`);
+        } catch (err) {
+          useBackupApi = true;
+        }
+      }
+      if (useBackupApi || ((_rs = rs) === null || _rs === void 0 ? void 0 : _rs.status) !== 200) {
+        useBackupApi = true;
+        rs = await axios.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');
+      }
+      return rs;
+    };
+    const getExchangeRate = async () => {
+      var _rs3;
+      let rs;
+      try {
+        rs = await axios.get('https://api-cache.subwallet.app/exchange-rate');
+      } catch (e) {
+        console.warn('Failed to get exchange rate');
+      }
+      if (((_rs3 = rs) === null || _rs3 === void 0 ? void 0 : _rs3.status) !== 200) {
+        console.warn('Failed to get exchange rate');
+      }
+      return rs;
+    };
+    const resMultiPromise = await Promise.all([getPriceMap(), getExchangeRate()]);
+    const responseDataPrice = ((_resMultiPromise$ = resMultiPromise[0]) === null || _resMultiPromise$ === void 0 ? void 0 : _resMultiPromise$.data) || [];
+    const responseDataExchangeRate = ((_resMultiPromise$2 = resMultiPromise[1]) === null || _resMultiPromise$2 === void 0 ? void 0 : _resMultiPromise$2.data) || {};
     const priceMap = {};
     const price24hMap = {};
-    responseData.forEach(val => {
+    const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
+      if (!staticData[StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
+        return map;
+      }
+      map[exchangeKey] = {
+        exchange: responseDataExchangeRate.conversion_rates[exchangeKey],
+        label: staticData[StaticKey.CURRENCY_SYMBOL][exchangeKey].label
+      };
+      return map;
+    }, {});
+    const currencyData = staticData[StaticKey.CURRENCY_SYMBOL][currencyCode];
+    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;
-
-      // if (inverseMap[val.id]) {
-      //   priceMap[inverseMap[val.id]] = currentPrice;
-      //   price24hMap[inverseMap[val.id]] = price24h;
-      // }
+      const exchangeRate = exchangeRateMap[currencyCode] || 1;
+      priceMap[val.id] = currentPrice * exchangeRate.exchange;
+      price24hMap[val.id] = price24h * exchangeRate.exchange;
     });
-
     return {
-      currency,
+      currency: currencyCode,
+      currencyData,
+      exchangeRateMap,
       priceMap,
       price24hMap
     };

package/koni/api/nft/config.js

@@ -88,6 +88,8 @@ export const TRANSFER_CHAIN_ID = {
   [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.shibuya]: 81
 };
 export let SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME;
+
+// This is for localhost or http only
 (function (SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME) {
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["statemine"] = "statemine";
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["acala"] = "acala";
@@ -110,27 +112,31 @@ if (isFirefox) {
     weight: 5000
   });
 }
-if (!RuntimeInfo.protocol || !RuntimeInfo.protocol.startsWith('http') || RuntimeInfo.protocol.startsWith('https')) {
-  RANDOM_IPFS_GATEWAY_SETTING.push({
-    provider: IPFS_FLEEK,
-    weight: 4
-  }, {
-    provider: IPFS_GATEWAY_4EVERLAND,
-    weight: 2
-  }, {
-    provider: IPFS_W3S_LINK,
-    weight: 1
-  }, {
-    provider: CF_IPFS_GATEWAY,
-    weight: 4
-  }, {
-    provider: PINATA_IPFS_GATEWAY,
-    weight: 1 // Rate limit too low
-  }, {
-    provider: IPFS_IO,
-    weight: 5
-  });
-} else if (!RuntimeInfo.protocol.startsWith('https')) {
+if (RuntimeInfo.protocol && RuntimeInfo.protocol.startsWith('http')) {
+  // This is for https
+  if (RuntimeInfo.protocol.startsWith('https')) {
+    RANDOM_IPFS_GATEWAY_SETTING.push({
+      provider: IPFS_FLEEK,
+      weight: 4
+    }, {
+      provider: IPFS_GATEWAY_4EVERLAND,
+      weight: 2
+    }, {
+      provider: IPFS_W3S_LINK,
+      weight: 1
+    }, {
+      provider: CF_IPFS_GATEWAY,
+      weight: 4
+    }, {
+      provider: PINATA_IPFS_GATEWAY,
+      weight: 1 // Rate limit too low
+    }, {
+      provider: IPFS_IO,
+      weight: 5
+    });
+  }
+} else {
+  // This is for extension env or other
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: NFT_STORAGE_GATEWAY,
     weight: 50

package/koni/background/handlers/Extension.d.ts

@@ -88,6 +88,7 @@ export default class KoniExtension {
     private subscribeAssetSetting;
     private updateAssetSetting;
     private getPrice;
+    private setPriceCurrency;
     private subscribePrice;
     private getBalance;
     private subscribeBalance;

package/koni/background/handlers/Extension.js

@@ -1024,6 +1024,11 @@ export default class KoniExtension {
   async getPrice() {
     return this.#koniState.priceService.getPrice();
   }
+  async setPriceCurrency({
+    currency
+  }) {
+    return await this.#koniState.priceService.setPriceCurrency(currency);
+  }
   subscribePrice(id, port) {
     const cb = createSubscription(id, port);
     const priceSubscription = this.#koniState.priceService.getPriceSubject().subscribe(rs => {
@@ -4158,6 +4163,8 @@ export default class KoniExtension {
         return await this.getPrice();
       case 'pri(price.getSubscription)':
         return await this.subscribePrice(id, port);
+      case 'pri(settings.savePriceCurrency)':
+        return await this.setPriceCurrency(request);
       case 'pri(balance.getBalance)':
         return await this.getBalance();
       case 'pri(balance.getSubscription)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.59-0",
+  "version": "1.1.60-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1829,6 +1829,7 @@
     "./utils/staticData/buyTokenConfigs.json": "./utils/staticData/buyTokenConfigs.json",
     "./utils/staticData/chains.json": "./utils/staticData/chains.json",
     "./utils/staticData/crowdloanFunds.json": "./utils/staticData/crowdloanFunds.json",
+    "./utils/staticData/currencySymbol.json": "./utils/staticData/currencySymbol.json",
     "./utils/staticData/marketingCampaigns.json": "./utils/staticData/marketingCampaigns.json",
     "./utils/staticData/termAndCondition.json": "./utils/staticData/termAndCondition.json",
     "./utils/swap": {
@@ -1873,11 +1874,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.57",
-    "@subwallet/extension-base": "^1.1.59-0",
-    "@subwallet/extension-chains": "^1.1.59-0",
-    "@subwallet/extension-dapp": "^1.1.59-0",
-    "@subwallet/extension-inject": "^1.1.59-0",
+    "@subwallet/chain-list": "0.2.58",
+    "@subwallet/extension-base": "^1.1.60-1",
+    "@subwallet/extension-chains": "^1.1.60-1",
+    "@subwallet/extension-dapp": "^1.1.60-1",
+    "@subwallet/extension-inject": "^1.1.60-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

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

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

@@ -7,7 +7,7 @@ import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/co
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { combineLatest, Observable } from 'rxjs';
 import { BN, BN_ZERO } from '@polkadot/util';
@@ -54,7 +54,13 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
     if (_BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
       unsubBridgedToken = await subscribeBridgedBalance(substrateParams);
     }
-    if (_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 (_isChainEvmCompatible(chainInfo) && _getTokenTypesSupportedByChain(chainInfo).includes(_AssetType.ERC20)) {
+      // Get sub-token for EVM-compatible chains
       unsubEvmContractToken = subscribeERC20Interval({
         ...baseParams,
         evmApi: evmApi

package/services/chain-service/index.js

@@ -645,7 +645,12 @@ export 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/services/chain-service/utils/index.d.ts

@@ -11,6 +11,19 @@ export declare function _isPureEvmChain(chainInfo: _ChainInfo): boolean;
 export declare function _isPureSubstrateChain(chainInfo: _ChainInfo): boolean;
 export declare function _getOriginChainOfAsset(assetSlug: string): string;
 export declare function _getContractAddressOfToken(tokenInfo: _ChainAsset): string;
+/**
+ * @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
+ * */
+export declare function _isNativeTokenTransferredByEvm(tokenInfo: _ChainAsset): boolean;
+/**
+ * @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
+ * */
 export declare function _isTokenTransferredByEvm(tokenInfo: _ChainAsset): boolean;
 export declare function _checkSmartContractSupportByChain(chainInfo: _ChainInfo, contractType: _AssetType): boolean;
 export declare function _getTokenOnChainAssetId(tokenInfo: _ChainAsset): string;

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

@@ -67,9 +67,27 @@ export function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
-export 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
+ * */
+export 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
+ * */
+export function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata3;
+  return !!((_tokenInfo$metadata3 = tokenInfo.metadata) !== null && _tokenInfo$metadata3 !== void 0 && _tokenInfo$metadata3.contractAddress) || _isNativeToken(tokenInfo) && _isNativeTokenTransferredByEvm(tokenInfo);
 }
 export function _checkSmartContractSupportByChain(chainInfo, contractType) {
   // EVM chains support smart contract by default so just checking Substrate chains
@@ -81,16 +99,16 @@ export function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 export 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';
 }
 export 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;
 }
 export 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;
 }
 export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -244,16 +262,16 @@ export function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, asset
   return assetRef.path === _AssetRefPath.XCM;
 }
 export 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) || '';
 }
 export 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';
 }
 export 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;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

package/services/price-service/coingecko.d.ts

@@ -1,2 +1,3 @@
-import { PriceJson } from '@subwallet/extension-base/background/KoniTypes';
-export declare const getTokenPrice: (priceIds: Set<string>, currency?: string) => Promise<PriceJson>;
+import { CurrencyType, ExchangeRateJSON, PriceJson } from '@subwallet/extension-base/background/KoniTypes';
+export declare const getExchangeRateMap: () => Promise<Record<CurrencyType, ExchangeRateJSON>>;
+export declare const getPriceMap: (priceIds: Set<string>, currency?: CurrencyType) => Promise<Omit<PriceJson, 'exchangeRateMap'>>;

package/services/price-service/coingecko.js

@@ -1,43 +1,61 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
 import axios from 'axios';
+const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
-export const getTokenPrice = async (priceIds, currency = 'usd') => {
+export const getExchangeRateMap = async () => {
   try {
-    var _res;
-    const idStr = Array.from(priceIds).join(',');
-    let res;
-    if (!useBackupApi) {
-      try {
-        res = await axios.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.get('https://api-cache.subwallet.app/exchange-rate')).data || {};
+    const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
+      if (!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[StaticKey.CURRENCY_SYMBOL][exchangeKey].label
+      };
+      return map;
+    }, {});
+    return exchangeRateMap;
+  } catch (e) {
+    console.warn('Failed to get exchange rate');
+    return {};
+  }
+};
+export const getPriceMap = async (priceIds, currency = 'USD') => {
+  var _rs, _rs2, _rs3;
+  const idStr = Array.from(priceIds).join(',');
+  let rs;
+  if (!useBackupApi) {
+    try {
+      rs = await axios.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.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.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[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
+  };
 };

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

@@ -1,4 +1,4 @@
-import { PriceJson } from '@subwallet/extension-base/background/KoniTypes';
+import { CurrencyType, PriceJson } from '@subwallet/extension-base/background/KoniTypes';
 import { CronServiceInterface, PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -10,12 +10,20 @@ export declare class PriceService implements StoppableServiceInterface, PersistD
     private eventService;
     private chainService;
     private priceSubject;
+    private rawPriceSubject;
+    private rawExchangeRateMap;
     private refreshTimeout;
     private priceIds;
+    private currency;
     constructor(dbService: DatabaseService, eventService: EventService, chainService: ChainService);
+    private getTokenPrice;
+    private refreshPromise;
+    private refreshPriceMapByAction;
+    private calculatePriceMap;
     getPrice(): Promise<PriceJson>;
     getPriceSubject(): BehaviorSubject<PriceJson>;
     getPriceIds(): Set<string>;
+    setPriceCurrency(newCurrencyCode: CurrencyType): Promise<boolean>;
     refreshPriceData(priceIds?: Set<string>): void;
     init(): Promise<void>;
     loadData(): Promise<void>;

package/services/price-service/index.js

@@ -1,27 +1,91 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_PRICE_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_PRICE_INTERVAL, CURRENCY } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { getTokenPrice } from '@subwallet/extension-base/services/price-service/coingecko';
+import { getExchangeRateMap, getPriceMap } from '@subwallet/extension-base/services/price-service/coingecko';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
+import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
 import { BehaviorSubject } from 'rxjs';
+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: {}
 };
 export class PriceService {
-  priceSubject = new BehaviorSubject(DEFAULT_PRICE_SUBJECT);
   priceIds = new Set();
   constructor(dbService, eventService, chainService) {
+    const currency = SWStorage.instance.getItem(CURRENCY);
+    this.currency = new BehaviorSubject(currency || DEFAULT_CURRENCY);
+    this.priceSubject = new BehaviorSubject({
+      ...DEFAULT_PRICE_SUBJECT,
+      currency: this.currency.value
+    });
+    this.rawPriceSubject = new BehaviorSubject({});
+    this.rawExchangeRateMap = new BehaviorSubject({});
     this.status = ServiceStatus.NOT_INITIALIZED;
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
     this.init().catch(console.error);
   }
+  async getTokenPrice(priceIds, currency, resolve, reject) {
+    await Promise.all([getExchangeRateMap(), getPriceMap(priceIds, currency)]).then(([exchangeRateMap, priceMap]) => {
+      this.rawExchangeRateMap.next(exchangeRateMap);
+      this.rawPriceSubject.next(priceMap);
+    });
+  }
+  refreshPromise = null;
+  refreshPriceMapByAction() {
+    this.refreshPromise = (async () => {
+      try {
+        await this.refreshPromise;
+        const newPriceMap = await this.calculatePriceMap();
+        if (newPriceMap) {
+          this.priceSubject.next(newPriceMap);
+        }
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.refreshPromise = null;
+      }
+    })();
+  }
+  async calculatePriceMap() {
+    const rawPrice = this.rawPriceSubject.value;
+    const exchangeRateData = this.rawExchangeRateMap.value;
+    const currencyKey = this.currency.value;
+    if (Object.keys(rawPrice).length === 0) {
+      return;
+    }
+    if (Object.keys(exchangeRateData).length === 0) {
+      return;
+    }
+    const finalPriceMap = {
+      ...JSON.parse(JSON.stringify(rawPrice)),
+      currency: currencyKey,
+      exchangeRateMap: exchangeRateData,
+      currencyData: staticData[StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
+    };
+    if (currencyKey === DEFAULT_CURRENCY) {
+      return finalPriceMap;
+    }
+    Object.keys(finalPriceMap.price24hMap).forEach(key => {
+      finalPriceMap.price24hMap[key] = rawPrice.price24hMap[key] * exchangeRateData[currencyKey].exchange;
+      finalPriceMap.priceMap[key] = rawPrice.priceMap[key] * exchangeRateData[currencyKey].exchange;
+    });
+    await this.dbService.updatePriceStore(finalPriceMap);
+    return finalPriceMap;
+  }
   async getPrice() {
     return Promise.resolve(this.priceSubject.value);
   }
@@ -32,18 +96,27 @@ export class PriceService {
     const priceIdList = Object.values(this.chainService.getAssetRegistry()).map(a => a.priceId).filter(a => a);
     return new Set(priceIdList);
   }
+  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));
+    SWStorage.instance.setItem(CURRENCY, newCurrencyCode);
+    return true;
+  }
   refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
-    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(() => {
+      this.refreshPriceMapByAction();
+    }).catch(e => {
+      console.error(e);
+    });
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), CRON_REFRESH_PRICE_INTERVAL);
   }
   async init() {
@@ -56,14 +129,22 @@ export class PriceService {
       // Compare two set newPriceIds and this.priceIds
       if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
         this.priceIds = newPriceIds;
-        this.refreshPriceData(this.priceIds);
+        this.refreshPriceMapByAction();
       }
     };
+    this.currency.subscribe(currency => {
+      console.log('Currency changed', currency);
+      this.calculatePriceMap().then(data => {
+        if (data) {
+          this.priceSubject.next(data);
+        }
+      }).catch(console.error);
+    });
     this.status = ServiceStatus.INITIALIZED;
     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/services/setting-service/constants.d.ts

@@ -5,6 +5,7 @@ export declare const DEFAULT_AUTO_LOCK_TIME = 15;
 export declare const DEFAULT_UNLOCK_TYPE: WalletUnlockType;
 export declare const DEFAULT_CHAIN_PATROL_ENABLE = false;
 export declare const DEFAULT_LANGUAGE: LanguageType;
+export declare const DEFAULT_CURRENCY = "usd";
 export declare const DEFAULT_SHOW_ZERO_BALANCE = true;
 export declare const DEFAULT_SHOW_BALANCE = false;
 export declare const DEFAULT_ALL_LOGO = "";