@subwallet/extension-base 1.2.14-0 → 1.2.16-0

package/services/chain-service/index.js

@@ -11,14 +11,14 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
-import { addLazy, fetchStaticData, filterAssetsByChainAndType, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
 const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !info.bitcoinInfo && !ignoredChains.includes(slug)));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'rollux_evm'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
 };
@@ -233,7 +233,7 @@ export class ChainService {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
   getSupportedSmartContractTypes() {
-    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.GRC721];
+    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.GRC721, _AssetType.VFT];
   }
   getActiveChainInfoMap() {
     const result = {};
@@ -655,6 +655,34 @@ export class ChainService {
     }
     const onUpdateStatus = status => {
       const slug = chainInfo.slug;
+      const isActive = this.getChainStateByKey(slug).active;
+      const isConnectProblem = status !== _ChainConnectionStatus.CONNECTING && status !== _ChainConnectionStatus.CONNECTED;
+      const isLightRpc = endpoint.startsWith('light');
+      if (isActive && isConnectProblem && !isLightRpc) {
+        const reportApiUrl = 'https://api-cache.subwallet.app/api/health-check/report-rpc';
+        const requestBody = {
+          chainSlug: slug,
+          chainStatus: status,
+          rpcReport: {
+            [providerName]: endpoint
+          },
+          configStatus: {
+            countUnstable: 10,
+            countDie: 20
+          }
+        };
+        fetch(reportApiUrl, {
+          // can get status from this response
+          method: 'POST',
+          headers: {
+            'X-API-KEY': '9b1c94a5e1f3a2d9f8b2a4d6e1f3a2d9',
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify(requestBody)
+        })
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        .then(() => {}).catch(error => console.error('Error connecting to the report API:', error));
+      }
       this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
@@ -664,6 +692,7 @@ export class ChainService {
       //
       //   this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
       // } else {
+
       const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, {
         providerName,
         onUpdateStatus
@@ -1420,7 +1449,7 @@ export class ChainService {
   async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     if ([_AssetType.ERC721, _AssetType.ERC20].includes(tokenType)) {
       return await this.evmChainHandler.getEvmContractTokenInfo(contractAddress, tokenType, originChain);
-    } else if ([_AssetType.PSP34, _AssetType.PSP22, _AssetType.GRC20].includes(tokenType)) {
+    } else if ([_AssetType.PSP34, _AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT].includes(tokenType)) {
       return await this.substrateChainHandler.getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
     }
     return {
@@ -1638,6 +1667,9 @@ export class ChainService {
       this.deleteCustomAssets(customToken);
     }
   }
+
+  /* Metadata */
+
   getMetadata(chain) {
     return this.dbService.stores.metadata.getMetadata(chain);
   }
@@ -1647,6 +1679,48 @@ export class ChainService {
   getMetadataByHash(hash) {
     return this.dbService.stores.metadata.getMetadataByGenesisHash(hash);
   }
+  getExtraInfo(chain) {
+    var _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4, _chainInfo$substrateI5, _chainInfo$substrateI6, _chainInfo$substrateI7;
+    const chainInfo = this.getChainInfoByKey(chain);
+    return {
+      decimals: (_chainInfo$substrateI2 = (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals) !== null && _chainInfo$substrateI2 !== void 0 ? _chainInfo$substrateI2 : 0,
+      tokenSymbol: (_chainInfo$substrateI4 = (_chainInfo$substrateI5 = chainInfo.substrateInfo) === null || _chainInfo$substrateI5 === void 0 ? void 0 : _chainInfo$substrateI5.symbol) !== null && _chainInfo$substrateI4 !== void 0 ? _chainInfo$substrateI4 : 'Unit',
+      base58Prefix: (_chainInfo$substrateI6 = (_chainInfo$substrateI7 = chainInfo.substrateInfo) === null || _chainInfo$substrateI7 === void 0 ? void 0 : _chainInfo$substrateI7.addressPrefix) !== null && _chainInfo$substrateI6 !== void 0 ? _chainInfo$substrateI6 : 42
+    };
+  }
+  async calculateMetadataHash(chain) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return calculateMetadataHash({
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+  async shortenMetadata(chain, txBlob) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return getShortMetadata(txBlob, {
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+
+  /* Metadata */
+
   getSubscanChainMap(reverse) {
     const result = {};
     const chainInfoMap = this.getChainInfoMap();

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

@@ -18,6 +18,11 @@ export declare enum _ChainConnectionStatus {
     UNSTABLE = "UNSTABLE",
     CONNECTING = "CONNECTING"
 }
+export interface ReportRpc {
+    runningRpc: Record<string, string>;
+    unstableRpc: Record<string, string>;
+    dieRpc: Record<string, string>;
+}
 export interface _ChainState {
     slug: string;
     active: boolean;
@@ -66,6 +71,7 @@ export interface _SubstrateApiState {
 export interface _SubstrateApi extends _SubstrateApiState, _ChainBaseApi {
     api: ApiPromise;
     isReady: Promise<_SubstrateApi>;
+    connect: (_callbackUpdateMetadata?: (substrateApi: _SubstrateApi) => void) => void;
     specName: string;
     specVersion: string;
     systemChain: string;

package/services/chain-service/types.js

@@ -12,6 +12,6 @@ export let _ChainConnectionStatus;
   _ChainConnectionStatus["CONNECTING"] = "CONNECTING";
 })(_ChainConnectionStatus || (_ChainConnectionStatus = {}));
 export const _CUSTOM_PREFIX = 'custom-';
-export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22, _AssetType.GRC20];
+export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT];
 export const _NFT_CONTRACT_STANDARDS = [_AssetType.PSP34, _AssetType.ERC721];
 export const _SMART_CONTRACT_STANDARDS = [..._FUNGIBLE_CONTRACT_STANDARDS, ..._NFT_CONTRACT_STANDARDS];

package/services/chain-service/utils/index.d.ts

@@ -48,6 +48,7 @@ export declare function _isChainSupportWasmNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportEvmERC20(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportWasmPSP22(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportGRC20(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSupportVFT(chainInfo: _ChainInfo): boolean;
 export declare const _isSupportOrdinal: (chain: string) => boolean;
 export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];

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

@@ -181,6 +181,10 @@ export function _isChainSupportGRC20(chainInfo) {
   var _chainInfo$substrateI12, _chainInfo$substrateI13;
   return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_AssetType.GRC20)) || false;
 }
+export function _isChainSupportVFT(chainInfo) {
+  var _chainInfo$substrateI14, _chainInfo$substrateI15;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : (_chainInfo$substrateI15 = _chainInfo$substrateI14.supportSmartContract) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.includes(_AssetType.VFT)) || false;
+}
 export const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -207,7 +211,7 @@ export function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_AssetType.PSP22, _AssetType.GRC20].includes(assetType)) {
+      if ([_AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -264,7 +268,7 @@ export function _isAssetSmartContractNft(assetInfo) {
   return [_AssetType.PSP34, _AssetType.ERC721].includes(assetInfo.assetType);
 }
 export function _isTokenGearSmartContract(tokenInfo) {
-  return [_AssetType.GRC20, _AssetType.GRC721].includes(tokenInfo.assetType);
+  return [_AssetType.GRC20, _AssetType.GRC721, _AssetType.VFT].includes(tokenInfo.assetType);
 }
 export function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
@@ -296,12 +300,12 @@ export function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 export function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI14;
-  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI16;
+  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _SubstrateChainType.RELAYCHAIN;
 }
 export function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI15;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI17;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.chainType) === _SubstrateChainType.PARACHAIN;
 }
 export function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -346,8 +350,8 @@ export function _getBlockExplorerFromChain(chainInfo) {
     var _chainInfo$evmInfo5;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
   } else {
-    var _chainInfo$substrateI16;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
+    var _chainInfo$substrateI18;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -373,8 +377,8 @@ export const _isAssetAutoEnable = chainAsset => {
   return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
 };
 export function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI17;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
+  var _chainInfo$substrateI19;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI19 = chainInfo.substrateInfo) === null || _chainInfo$substrateI19 === void 0 ? void 0 : _chainInfo$substrateI19.crowdloanUrl) || '';
 }
 export function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_CUSTOM_PREFIX);
@@ -410,8 +414,8 @@ export function _isMantaZkAsset(chainAsset) {
   return _MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_ZK_ASSET_PREFIX);
 }
 export function _getChainExistentialDeposit(chainInfo) {
-  var _chainInfo$substrateI18;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.existentialDeposit) || '0';
+  var _chainInfo$substrateI20;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI20 = chainInfo.substrateInfo) === null || _chainInfo$substrateI20 === void 0 ? void 0 : _chainInfo$substrateI20.existentialDeposit) || '0';
 }
 export function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {

package/services/earning-service/handlers/liquid-staking/acala.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { fakeAddress } from '@subwallet/extension-base/services/earning-service/constants';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
@@ -9,6 +10,9 @@ import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import BaseLiquidStakingPoolHandler from "./base.js";
 const GRAPHQL_API = 'https://api.polkawallet.io/acala-liquid-staking-subql';
 const EXCHANGE_RATE_REQUEST = 'query { dailySummaries(first:30, orderBy:TIMESTAMP_DESC) {nodes { exchangeRate timestamp }}}';
+function convertDerivativeToken(amount, exchangeRate, decimals) {
+  return amount.mul(new BN(exchangeRate)).div(BN_TEN.pow(new BN(decimals)));
+}
 export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
   altInputAsset = 'polkadot-NATIVE-DOT';
   derivativeAssets = ['acala-LOCAL-LDOT'];
@@ -22,8 +26,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     defaultUnstake: true,
     fastUnstake: true,
     cancelUnstake: false,
-    withdraw: false,
-    // TODO: Change after verify unstake info
+    withdraw: true,
     claimReward: false
   };
   constructor(state, chain) {
@@ -111,30 +114,55 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
         return;
       }
       const balances = _balances;
-      const redeemRequests = await substrateApi.api.query.homa.redeemRequests.multi(useAddresses);
-      // This rate is multiple with decimals
-      const exchangeRate = await this.getExchangeRate();
-      const decimals = BN_TEN.pow(new BN(this.rateDecimals));
+      const [redeemRequests, exchangeRate, _currentEra] = await Promise.all([substrateApi.api.query.homa.redeemRequests.multi(useAddresses), this.getExchangeRate(), substrateApi.api.query.homa.relayChainCurrentEra()]);
+      const currentEra = _currentEra.toPrimitive();
       for (let i = 0; i < balances.length; i++) {
         const balanceItem = balances[i];
         const address = useAddresses[i];
         const activeTotalBalance = balanceItem.free || BN_ZERO;
-        let totalBalance = activeTotalBalance.mul(new BN(exchangeRate)).div(decimals);
+        let totalBalance = convertDerivativeToken(activeTotalBalance, exchangeRate, this.rateDecimals);
         let unlockingBalance = BN_ZERO;
         const unstakings = [];
+
+        // Handle redeem request
         const redeemRequest = redeemRequests[i].toPrimitive();
         if (redeemRequest) {
-          // If withdrawable = false, redeem request is claimed
-          const [redeemAmount, withdrawable] = redeemRequest;
-
-          // Redeem amount in derivative token
-          const amount = new BN(redeemAmount).mul(new BN(exchangeRate)).div(decimals);
-          totalBalance = totalBalance.add(amount);
-          unlockingBalance = unlockingBalance.add(amount);
+          const [derivativeRedeemAmount, _] = redeemRequest;
+          const redeemAmount = convertDerivativeToken(new BN(derivativeRedeemAmount), exchangeRate, this.rateDecimals);
+          totalBalance = totalBalance.add(redeemAmount);
+          unlockingBalance = unlockingBalance.add(redeemAmount);
           unstakings.push({
             chain: this.chain,
-            status: withdrawable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-            claimable: amount.toString()
+            status: UnstakingStatus.UNLOCKING,
+            claimable: redeemAmount.toString(),
+            waitingTime: 28 * _STAKING_ERA_LENGTH_MAP.polkadot // up to 29 day (in case non-fast-match
+          });
+        }
+
+        // Handle unbondings
+        const unbondings = await substrateApi.api.query.homa.unbondings.entries(address);
+        if (unbondings.length > 0) {
+          unbondings.forEach(([unbondingInfo, unbondingValue]) => {
+            // @ts-ignore
+            const _targetEra = unbondingInfo.toHuman()[1];
+            const targetEra = parseInt(_targetEra.replaceAll(',', ''));
+            const amount = new BN(unbondingValue.toPrimitive());
+            totalBalance = totalBalance.add(amount);
+            unlockingBalance = unlockingBalance.add(amount);
+            if (targetEra > currentEra) {
+              unstakings.push({
+                chain: this.chain,
+                status: UnstakingStatus.UNLOCKING,
+                claimable: amount.toString(),
+                waitingTime: (targetEra - currentEra) * _STAKING_ERA_LENGTH_MAP.polkadot // Todo: Handle exact timestamp?
+              });
+            } else {
+              unstakings.push({
+                chain: this.chain,
+                status: UnstakingStatus.CLAIMABLE,
+                claimable: amount.toString()
+              });
+            }
           });
         }
         const result = {
@@ -225,7 +253,8 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
     const chainApi = await this.substrateApi.isReady;
-    const extrinsic = chainApi.api.tx.homa.requestRedeem(amount, false);
+    const extrinsic = chainApi.api.tx.homa.requestRedeem(amount, true); // set true to allow fast match
+
     return [ExtrinsicType.UNSTAKE_LDOT, extrinsic];
   }
   async handleYieldWithdraw(address, unstakingInfo) {

package/services/earning-service/service.js

@@ -137,6 +137,9 @@ export default class EarningService {
           if (event.type === 'account.remove') {
             removedAddresses.push(event.data[0]);
           }
+          if (event.type === 'account.add') {
+            delayReload = true;
+          }
           if (event.type === 'chain.updateState') {
             const chainState = this.state.getChainStateByKey(event.data[0]);
             if (chainState && !_isChainEnabled(chainState)) {

package/services/migration-service/scripts/databases/ClearMetadataDatabase.js

@@ -2,10 +2,26 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { cacheMetadata, waitTimeout } from '@subwallet/extension-base/utils';
 export default class ClearMetadataDatabase extends BaseMigrationJob {
   async run() {
     // Clear all old metadata data
     await this.state.dbService.stores.metadata.clear();
+    const activeChains = this.state.chainService.getActiveChains();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const reloadChains = activeChains.filter(chain => {
+      var _chainInfoMap$chain$s;
+      return !!((_chainInfoMap$chain$s = chainInfoMap[chain].substrateInfo) !== null && _chainInfoMap$chain$s !== void 0 && _chainInfoMap$chain$s.genesisHash);
+    });
+    for (const chain of reloadChains) {
+      const substrateApi = this.state.chainService.getSubstrateApi(chain);
+      const callback = substrateApi => {
+        cacheMetadata(chain, substrateApi, this.state.chainService);
+      };
+      Promise.race([substrateApi.isReady, waitTimeout(2000)]).finally(() => {
+        substrateApi === null || substrateApi === void 0 ? void 0 : substrateApi.connect(callback);
+      });
+    }
     return Promise.resolve();
   }
 }

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

@@ -1,14 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import AutoEnableSomeTokens from '@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens';
-import ReloadMetadata from '@subwallet/extension-base/services/migration-service/scripts/databases/ReloadMetadata';
-import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
-import MigrateRemoveGenesisHash from '@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash';
-import MigrateTransactionHistoryBySymbol from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol';
+import AutoEnableSomeTokens from "./databases/AutoEnableSomeTokens.js";
 import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
+import ReloadMetadata from "./databases/ReloadMetadata.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -16,6 +13,7 @@ import MigratePolygonUSDCProvider from "./tokens/MigratePolygonUSDCProvider.js";
 import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
 import DeleteChain from "./DeleteChain.js";
 import DeleteChainStaking from "./DeleteChainStaking.js";
+import DeleteEarningData from "./DeleteEarningData.js";
 import EnableVaraChain from "./EnableVaraChain.js";
 import MigrateAuthUrls from "./MigrateAuthUrls.js";
 import MigrateAutoLock from "./MigrateAutoLock.js";
@@ -24,9 +22,11 @@ import MigrateImportedToken from "./MigrateImportedToken.js";
 import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateLedgerAccountV2 from "./MigrateLedgerAccountV2.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
+import MigrateRemoveGenesisHash from "./MigrateRemoveGenesisHash.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
+import MigrateTransactionHistoryBySymbol from "./MigrateTransactionHistoryBySymbol.js";
 import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
 export default {
@@ -56,8 +56,8 @@ export default {
   '1.1.69-03': MigrateAssetSetting,
   '1.1.69-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
-  '1.2.1-01': ClearMetadataDatabase,
-  '1.2.13-01': ReloadMetadata
+  '1.2.13-01': ReloadMetadata,
+  '1.2.14-01': ClearMetadataDatabase
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/price-service/coingecko.js

@@ -2,12 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
+import { isArray } from '@polkadot/util';
 const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
 export const getExchangeRateMap = async () => {
+  let response;
   try {
-    const response = await fetch('https://api-cache.subwallet.app/exchange-rate');
-    const responseDataExchangeRate = (await response.json()) || {};
+    var _response, _response2;
+    try {
+      response = await fetch('https://api-cache.subwallet.app/exchange-rate');
+    } catch (e) {}
+    if (((_response = response) === null || _response === void 0 ? void 0 : _response.status) !== 200) {
+      try {
+        response = await fetch('https://static-cache.subwallet.app/exchange-rate/data.json');
+      } catch (e) {}
+    }
+    const responseDataExchangeRate = (await ((_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.json())) || {};
     const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
       if (!staticData[StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
         return map;
@@ -20,42 +30,54 @@ export const getExchangeRateMap = async () => {
     }, {});
     return exchangeRateMap;
   } catch (e) {
-    console.warn('Failed to get exchange rate');
     return {};
   }
 };
 export const getPriceMap = async (priceIds, currency = 'USD') => {
-  var _rs, _rs2;
   const idStr = Array.from(priceIds).join(',');
-  let rs;
-  if (!useBackupApi) {
-    try {
-      rs = await fetch(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
-    } catch (err) {
+  let response;
+  try {
+    var _response3, _response5;
+    if (!useBackupApi) {
+      try {
+        response = await fetch(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
+      } catch (err) {
+        useBackupApi = true;
+      }
+    }
+    if (useBackupApi || ((_response3 = response) === null || _response3 === void 0 ? void 0 : _response3.status) !== 200) {
+      var _response4;
       useBackupApi = true;
+      try {
+        response = await fetch(`https://api-cache.subwallet.app/api/price/get?ids=${idStr}`);
+      } catch (e) {}
+      if (((_response4 = response) === null || _response4 === void 0 ? void 0 : _response4.status) !== 200) {
+        try {
+          response = await fetch('https://static-cache.subwallet.app/price/data.json');
+        } catch (e) {}
+      }
     }
+    const generateDataPriceRaw = (await ((_response5 = response) === null || _response5 === void 0 ? void 0 : _response5.json())) || [];
+    const responseDataPrice = isArray(generateDataPriceRaw) ? generateDataPriceRaw : Object.entries(generateDataPriceRaw).map(([id, value]) => ({
+      ...value,
+      id
+    }));
+    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
+    };
+  } catch (e) {
+    return {};
   }
-  if (useBackupApi || ((_rs = rs) === null || _rs === void 0 ? void 0 : _rs.status) !== 200) {
-    useBackupApi = true;
-    rs = await fetch(`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 = (await rs.json()) || [];
-  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.js

@@ -6,9 +6,10 @@ import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { getExchangeRateMap, getPriceMap } from '@subwallet/extension-base/services/price-service/coingecko';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { CurrentCurrencyStore } from '@subwallet/extension-base/stores';
+import { wait } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, combineLatest } from 'rxjs';
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_PRICE_SUBJECT = {
   currency: DEFAULT_CURRENCY,
@@ -22,6 +23,9 @@ const DEFAULT_PRICE_SUBJECT = {
   price24hMap: {},
   exchangeRateMap: {}
 };
+const checkFetchSuccess = (obj1, obj2) => {
+  return Object.keys(obj1).length > 0 && Object.keys(obj2).length > 0;
+};
 export class PriceService {
   priceIds = new Set();
   currency = new CurrentCurrencyStore();
@@ -43,10 +47,15 @@ export class PriceService {
     this.init().then(() => this.getCurrentCurrency(updateCurrency)).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);
-    });
+    const getPriceData = async () => {
+      await Promise.all([getExchangeRateMap(), getPriceMap(priceIds, currency)]).then(([exchangeRateMap, priceMap]) => {
+        if (checkFetchSuccess(priceMap, exchangeRateMap)) {
+          this.rawExchangeRateMap.next(exchangeRateMap);
+          this.rawPriceSubject.next(priceMap);
+        }
+      });
+    };
+    await Promise.race([getPriceData(), wait(10 * 1000)]);
   }
   getCurrentCurrencySubject() {
     return this.currency.getSubject();
@@ -82,17 +91,27 @@ export class PriceService {
     })();
   }
   async calculatePriceMap(currency) {
-    const {
+    let {
       price24hMap,
       priceMap
     } = this.rawPriceSubject.value;
-    const exchangeRateData = this.rawExchangeRateMap.value;
+    let exchangeRateData = this.rawExchangeRateMap.value;
+    const priceStored = await this.dbService.getPriceStore(currency);
     const currencyKey = currency || DEFAULT_CURRENCY;
     if (Object.keys(this.rawPriceSubject.value).length === 0) {
-      return;
+      if (priceStored !== null && priceStored !== void 0 && priceStored.exchangeRateMap) {
+        exchangeRateData = priceStored.exchangeRateMap;
+      }
     }
     if (Object.keys(exchangeRateData).length === 0) {
-      return;
+      if (priceStored !== null && priceStored !== void 0 && priceStored.price24hMap) {
+        price24hMap = {
+          ...priceStored.price24hMap
+        };
+        priceMap = {
+          ...priceStored.priceMap
+        };
+      }
     }
     const finalPriceMap = {
       priceMap: {
@@ -158,8 +177,7 @@ export class PriceService {
         this.refreshPriceMapByAction();
       }
     };
-    this.getCurrentCurrencySubject().subscribe(currency => {
-      console.log('Currency changed', currency);
+    combineLatest([this.getCurrentCurrencySubject(), this.rawPriceSubject, this.rawExchangeRateMap]).subscribe(([currency]) => {
       this.calculatePriceMap(currency).then(data => {
         if (data) {
           this.priceSubject.next(data);