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

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

@@ -38,6 +38,7 @@ var _exportNames = {
   _isChainSupportEvmERC20: true,
   _isChainSupportWasmPSP22: true,
   _isChainSupportGRC20: true,
+  _isChainSupportVFT: true,
   _isSupportOrdinal: true,
   _getNftTypesSupportedByChain: true,
   _getTokenTypesSupportedByChain: true,
@@ -131,6 +132,7 @@ exports._isChainSupportEvmNft = _isChainSupportEvmNft;
 exports._isChainSupportGRC20 = _isChainSupportGRC20;
 exports._isChainSupportNativeNft = _isChainSupportNativeNft;
 exports._isChainSupportSubstrateStaking = _isChainSupportSubstrateStaking;
+exports._isChainSupportVFT = _isChainSupportVFT;
 exports._isChainSupportWasmNft = _isChainSupportWasmNft;
 exports._isChainSupportWasmPSP22 = _isChainSupportWasmPSP22;
 exports._isChainTestNet = _isChainTestNet;
@@ -357,6 +359,10 @@ 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(_types._AssetType.GRC20)) || false;
 }
+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(_types._AssetType.VFT)) || false;
+}
 const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -384,7 +390,7 @@ function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_types._AssetType.PSP22, _types._AssetType.GRC20].includes(assetType)) {
+      if ([_types._AssetType.PSP22, _types._AssetType.GRC20, _types._AssetType.VFT].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -441,7 +447,7 @@ function _isAssetSmartContractNft(assetInfo) {
   return [_types._AssetType.PSP34, _types._AssetType.ERC721].includes(assetInfo.assetType);
 }
 function _isTokenGearSmartContract(tokenInfo) {
-  return [_types._AssetType.GRC20, _types._AssetType.GRC721].includes(tokenInfo.assetType);
+  return [_types._AssetType.GRC20, _types._AssetType.GRC721, _types._AssetType.VFT].includes(tokenInfo.assetType);
 }
 function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
@@ -473,12 +479,12 @@ function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI14;
-  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI16;
+  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _types._SubstrateChainType.RELAYCHAIN;
 }
 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) === _types._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) === _types._SubstrateChainType.PARACHAIN;
 }
 function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -523,8 +529,8 @@ 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;
@@ -551,8 +557,8 @@ const _isAssetAutoEnable = chainAsset => {
 };
 exports._isAssetAutoEnable = _isAssetAutoEnable;
 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) || '';
 }
 function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_types2._CUSTOM_PREFIX);
@@ -590,8 +596,8 @@ function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
 }
 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';
 }
 function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants = require("@subwallet/extension-base/services/earning-service/constants");
+var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _util = require("@polkadot/util");
 var _base = _interopRequireDefault(require("./base"));
@@ -16,6 +17,9 @@ var _base = _interopRequireDefault(require("./base"));
 
 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 _util.BN(exchangeRate)).div(_util.BN_TEN.pow(new _util.BN(decimals)));
+}
 class AcalaLiquidStakingPoolHandler extends _base.default {
   altInputAsset = 'polkadot-NATIVE-DOT';
   derivativeAssets = ['acala-LOCAL-LDOT'];
@@ -29,8 +33,7 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
     defaultUnstake: true,
     fastUnstake: true,
     cancelUnstake: false,
-    withdraw: false,
-    // TODO: Change after verify unstake info
+    withdraw: true,
     claimReward: false
   };
   constructor(state, chain) {
@@ -118,30 +121,56 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
         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 = _util.BN_TEN.pow(new _util.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 || _util.BN_ZERO;
-        let totalBalance = activeTotalBalance.mul(new _util.BN(exchangeRate)).div(decimals);
+        let totalBalance = convertDerivativeToken(activeTotalBalance, exchangeRate, this.rateDecimals);
         let unlockingBalance = _util.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 _util.BN(redeemAmount).mul(new _util.BN(exchangeRate)).div(decimals);
-          totalBalance = totalBalance.add(amount);
-          unlockingBalance = unlockingBalance.add(amount);
+          const [derivativeRedeemAmount, _] = redeemRequest;
+          const redeemAmount = convertDerivativeToken(new _util.BN(derivativeRedeemAmount), exchangeRate, this.rateDecimals);
+          totalBalance = totalBalance.add(redeemAmount);
+          unlockingBalance = unlockingBalance.add(redeemAmount);
           unstakings.push({
             chain: this.chain,
-            status: withdrawable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
-            claimable: amount.toString()
+            status: _types.UnstakingStatus.UNLOCKING,
+            claimable: redeemAmount.toString(),
+            waitingTime: 28 * _constants._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(_ref => {
+            let [unbondingInfo, unbondingValue] = _ref;
+            // @ts-ignore
+            const _targetEra = unbondingInfo.toHuman()[1];
+            const targetEra = parseInt(_targetEra.replaceAll(',', ''));
+            const amount = new _util.BN(unbondingValue.toPrimitive());
+            totalBalance = totalBalance.add(amount);
+            unlockingBalance = unlockingBalance.add(amount);
+            if (targetEra > currentEra) {
+              unstakings.push({
+                chain: this.chain,
+                status: _types.UnstakingStatus.UNLOCKING,
+                claimable: amount.toString(),
+                waitingTime: (targetEra - currentEra) * _constants._STAKING_ERA_LENGTH_MAP.polkadot // Todo: Handle exact timestamp?
+              });
+            } else {
+              unstakings.push({
+                chain: this.chain,
+                status: _types.UnstakingStatus.CLAIMABLE,
+                claimable: amount.toString()
+              });
+            }
           });
         }
         const result = {
@@ -181,7 +210,7 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
     const poolOriginSubstrateApi = await this.substrateApi.isReady;
     const defaultFeeTokenSlug = this.feeAssets[0];
     if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
-      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(_constants.fakeAddress);
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(_constants2.fakeAddress);
       const mintFeeInfo = _mintFeeInfo.toPrimitive();
       return {
         amount: mintFeeInfo.partialFee.toString(),
@@ -232,7 +261,8 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
   }
   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 [_KoniTypes.ExtrinsicType.UNSTAKE_LDOT, extrinsic];
   }
   async handleYieldWithdraw(address, unstakingInfo) {

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

@@ -144,6 +144,9 @@ 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 && !(0, _utils._isChainEnabled)(chainState)) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,6 +14,21 @@ class ClearMetadataDatabase extends _Base.default {
   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 => {
+        (0, _utils.cacheMetadata)(chain, substrateApi, this.state.chainService);
+      };
+      Promise.race([substrateApi.isReady, (0, _utils.waitTimeout)(2000)]).finally(() => {
+        substrateApi === null || substrateApi === void 0 ? void 0 : substrateApi.connect(callback);
+      });
+    }
     return Promise.resolve();
   }
 }

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

@@ -5,14 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.EVERYTIME = void 0;
-var _AutoEnableSomeTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens"));
-var _ReloadMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/ReloadMetadata"));
-var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
-var _MigrateRemoveGenesisHash = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash"));
-var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol"));
+var _AutoEnableSomeTokens = _interopRequireDefault(require("./databases/AutoEnableSomeTokens"));
 var _ClearMetadataDatabase = _interopRequireDefault(require("./databases/ClearMetadataDatabase"));
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
+var _ReloadMetadata = _interopRequireDefault(require("./databases/ReloadMetadata"));
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
@@ -20,6 +17,7 @@ var _MigratePolygonUSDCProvider = _interopRequireDefault(require("./tokens/Migra
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
 var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _DeleteChainStaking = _interopRequireDefault(require("./DeleteChainStaking"));
+var _DeleteEarningData = _interopRequireDefault(require("./DeleteEarningData"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateAutoLock = _interopRequireDefault(require("./MigrateAutoLock"));
@@ -28,9 +26,11 @@ var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedTok
 var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccount"));
 var _MigrateLedgerAccountV = _interopRequireDefault(require("./MigrateLedgerAccountV2"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
+var _MigrateRemoveGenesisHash = _interopRequireDefault(require("./MigrateRemoveGenesisHash"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
+var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -64,8 +64,8 @@ var _default = {
   '1.1.69-03': _MigrateAssetSetting.default,
   '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
-  '1.2.1-01': _ClearMetadataDatabase.default,
-  '1.2.13-01': _ReloadMetadata.default
+  '1.2.13-01': _ReloadMetadata.default,
+  '1.2.14-01': _ClearMetadataDatabase.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -5,15 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPriceMap = exports.getExchangeRateMap = void 0;
 var _staticData = require("@subwallet/extension-base/utils/staticData");
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
 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.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
         return map;
@@ -26,45 +36,60 @@ const getExchangeRateMap = async () => {
     }, {});
     return exchangeRateMap;
   } catch (e) {
-    console.warn('Failed to get exchange rate');
     return {};
   }
 };
 exports.getExchangeRateMap = getExchangeRateMap;
 const getPriceMap = async function (priceIds) {
-  var _rs, _rs2;
   let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'USD';
   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 = (0, _util.isArray)(generateDataPriceRaw) ? generateDataPriceRaw : Object.entries(generateDataPriceRaw).map(_ref => {
+      let [id, value] = _ref;
+      return {
+        ...value,
+        id
+      };
+    });
+    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
+    };
+  } 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.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.getPriceMap = getPriceMap;

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

@@ -9,6 +9,7 @@ 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 _stores = require("@subwallet/extension-base/stores");
+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");
@@ -28,6 +29,9 @@ const DEFAULT_PRICE_SUBJECT = {
   price24hMap: {},
   exchangeRateMap: {}
 };
+const checkFetchSuccess = (obj1, obj2) => {
+  return Object.keys(obj1).length > 0 && Object.keys(obj2).length > 0;
+};
 class PriceService {
   priceIds = new Set();
   currency = new _stores.CurrentCurrencyStore();
@@ -49,11 +53,16 @@ class PriceService {
     this.init().then(() => this.getCurrentCurrency(updateCurrency)).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);
-    });
+    const getPriceData = async () => {
+      await Promise.all([(0, _coingecko.getExchangeRateMap)(), (0, _coingecko.getPriceMap)(priceIds, currency)]).then(_ref => {
+        let [exchangeRateMap, priceMap] = _ref;
+        if (checkFetchSuccess(priceMap, exchangeRateMap)) {
+          this.rawExchangeRateMap.next(exchangeRateMap);
+          this.rawPriceSubject.next(priceMap);
+        }
+      });
+    };
+    await Promise.race([getPriceData(), (0, _utils.wait)(10 * 1000)]);
   }
   getCurrentCurrencySubject() {
     return this.currency.getSubject();
@@ -89,17 +98,27 @@ 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: {
@@ -165,8 +184,8 @@ class PriceService {
         this.refreshPriceMapByAction();
       }
     };
-    this.getCurrentCurrencySubject().subscribe(currency => {
-      console.log('Currency changed', currency);
+    (0, _rxjs.combineLatest)([this.getCurrentCurrencySubject(), this.rawPriceSubject, this.rawExchangeRateMap]).subscribe(_ref2 => {
+      let [currency] = _ref2;
       this.calculatePriceMap(currency).then(data => {
         if (data) {
           this.priceSubject.next(data);

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

@@ -1047,20 +1047,25 @@ class TransactionService {
     const signerOption = {
       signer: {
         signPayload: async payload => {
-          const signing = await this.state.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
+          const {
+            signature,
+            signedTransaction
+          } = await this.state.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
-            signature: signing.signature
+            signature,
+            signedTransaction
           };
         }
-      }
+      },
+      withSignedTransaction: true
     };
     if ((0, _utils3._isRuntimeUpdated)(signedExtensions)) {
-      try {
-        const metadataHash = await (0, _utils3.getMetadataHash)(chain);
+      const metadataHash = await this.state.chainService.calculateMetadataHash(chain);
+      if (metadataHash) {
         signerOption.mode = 1;
-        signerOption.metadataHash = `0x${metadataHash}`;
-      } catch (e) {}
+        signerOption.metadataHash = metadataHash;
+      }
     }
     extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event

package/cjs/utils/gear/combine.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GEAR_DEFAULT_ADDRESS = exports.DEFAULT_GEAR_ADDRESS = void 0;
+exports.getGRC20ContractPromise = getGRC20ContractPromise;
+exports.getVFTContractPromise = getVFTContractPromise;
+var _grc = require("./grc20");
+var _vft = require("./vft");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const DEFAULT_GEAR_ADDRESS = {
+  ALICE: '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
+  BOB: '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'
+};
+exports.DEFAULT_GEAR_ADDRESS = DEFAULT_GEAR_ADDRESS;
+const GEAR_DEFAULT_ADDRESS = '5EYCAe5ijiYfAXEth5DGRKiKuVjTXQKr877tUPz6eLz2t9aG';
+exports.GEAR_DEFAULT_ADDRESS = GEAR_DEFAULT_ADDRESS;
+function getGRC20ContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new _grc.GRC20(gearApi, contractAddress);
+}
+function getVFTContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new _vft.VFT(gearApi, contractAddress);
+}