@subwallet/extension-base 1.3.39-0 → 1.3.41-0

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dryRunXcmExtrinsicV2 = exports.createXcmExtrinsicV2 = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = exports.createAcrossBridgeExtrinsic = void 0;
-var _constants = require("@subwallet/extension-base/constants");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
@@ -14,7 +13,7 @@ var _snowBridge = require("@subwallet/extension-base/services/balance-service/tr
 var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _xcmPallet = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet");
 var _xTokens = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
@@ -47,6 +46,8 @@ const createSnowBridgeExtrinsic = async _ref => {
   }
   return (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
+
+// deprecated
 exports.createSnowBridgeExtrinsic = createSnowBridgeExtrinsic;
 const createXcmExtrinsic = async _ref2 => {
   let {
@@ -62,11 +63,11 @@ const createXcmExtrinsic = async _ref2 => {
   }
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  const polkadotXcmSpecialCases = _constants2._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils2._isNativeToken)(originTokenInfo);
-  if (_constants2._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils2._isNativeToken)(originTokenInfo);
+  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
     return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
-  if (_constants2._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+  if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
     return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
   return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
@@ -138,38 +139,34 @@ const createXcmExtrinsicV2 = async request => {
     return await (0, _utils.buildXcm)(request);
   } catch (e) {
     console.log('createXcmExtrinsicV2 error: ', e);
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if ((0, _utils.isChainNotSupportPolkadotApi)(errorMessage)) {
-      return createXcmExtrinsic(request);
-    }
     return undefined;
   }
 };
 exports.createXcmExtrinsicV2 = createXcmExtrinsicV2;
 const dryRunXcmExtrinsicV2 = async request => {
   try {
-    return await (0, _utils.dryRunXcmV2)(request);
-  } catch (e) {
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if ((0, _utils.isChainNotSupportDryRun)(errorMessage) || (0, _utils.isChainNotSupportPolkadotApi)(errorMessage)) {
-      const xcmTransfer = await createXcmExtrinsicV2(request);
-      if (!xcmTransfer) {
-        return {
-          success: false
-        };
+    const dryRunResult = await (0, _utils.dryRunXcm)(request);
+    const originDryRunRs = dryRunResult.origin;
+    if (originDryRunRs.success) {
+      const {
+        assetHub,
+        bridgeHub,
+        destination
+      } = dryRunResult;
+      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+          // pass dry-run in these cases
+          return (0, _utils.isChainNotSupportDryRun)(destination.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destination.failureReason);
+        }
+        return false;
       }
-      const _xcmFeeInfo = await xcmTransfer.paymentInfo(request.sender);
-      const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
-
-      // skip dry run in this case
-      return {
-        success: true,
-        fee: Math.round(xcmFeeInfo.partialFee * _constants.XCM_MIN_AMOUNT_RATIO).toString()
-      };
+      return true;
     }
-    return {
-      success: false
-    };
+
+    // pass dry-run in these cases
+    return (0, _utils.isChainNotSupportDryRun)(originDryRunRs.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunRs.failureReason);
+  } catch (e) {
+    return false;
   }
 };
 exports.dryRunXcmExtrinsicV2 = dryRunXcmExtrinsicV2;

package/cjs/services/balance-service/transfer/xcm/utils.js

@@ -6,23 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.STABLE_XCM_VERSION = void 0;
 exports.buildXcm = buildXcm;
 exports.dryRunXcm = dryRunXcm;
-exports.dryRunXcmV2 = dryRunXcmV2;
+exports.estimateXcmFee = estimateXcmFee;
 exports.isChainNotSupportDryRun = isChainNotSupportDryRun;
 exports.isChainNotSupportPolkadotApi = isChainNotSupportPolkadotApi;
 exports.isUseTeleportProtocol = isUseTeleportProtocol;
-var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _paraspellChainMap = require("@subwallet/extension-base/constants/paraspell-chain-map");
-var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
+var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const paraSpellEndpoint = 'https://api.lightspell.xyz';
+const version = '/v3';
 const paraSpellApi = {
-  buildXcm: `${paraSpellEndpoint}/x-transfer`,
-  dryRunXcm: `${paraSpellEndpoint}/dry-run`
+  buildXcm: `${version}/x-transfer`,
+  dryRunXcm: `${version}/dry-run`,
+  feeXcm: `${version}/xcm-fee`
 };
-const paraSpellKey = process.env.PARASPELL_API_KEY || '';
 function txHexToSubmittableExtrinsic(api, hex) {
   try {
     (0, _util.assert)((0, _util.isHex)(hex), 'Expected a hex-encoded call');
@@ -85,7 +85,7 @@ async function buildXcm(request) {
     substrateApi
   } = request;
   if (!substrateApi) {
-    return Promise.reject(new Error('Substrate API is not available'));
+    throw new Error('Substrate API is not available');
   }
   const psAssetType = (_originTokenInfo$meta = originTokenInfo.metadata) === null || _originTokenInfo$meta === void 0 ? void 0 : _originTokenInfo$meta.paraSpellAssetType;
   const psAssetValue = (_originTokenInfo$meta2 = originTokenInfo.metadata) === null || _originTokenInfo$meta2 === void 0 ? void 0 : _originTokenInfo$meta2.paraSpellValue;
@@ -99,13 +99,12 @@ async function buildXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.buildXcm, {
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.buildXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -116,8 +115,6 @@ async function buildXcm(request) {
   const chainApi = await substrateApi.isReady;
   return txHexToSubmittableExtrinsic(chainApi.api, extrinsicHex);
 }
-
-// dry run can fail due to sender address & amount token
 async function dryRunXcm(request) {
   var _originTokenInfo$meta3, _originTokenInfo$meta4;
   const {
@@ -132,76 +129,75 @@ async function dryRunXcm(request) {
   const psAssetType = (_originTokenInfo$meta3 = originTokenInfo.metadata) === null || _originTokenInfo$meta3 === void 0 ? void 0 : _originTokenInfo$meta3.paraSpellAssetType;
   const psAssetValue = (_originTokenInfo$meta4 = originTokenInfo.metadata) === null || _originTokenInfo$meta4 === void 0 ? void 0 : _originTokenInfo$meta4.paraSpellValue;
   if (!psAssetType || !psAssetValue) {
-    throw new Error('Token is not support XCM at this time'); // todo: content
+    throw new Error('Token is not support XCM at this time');
   }
-
-  let dryRunInfo;
-  try {
-    const bodyData = {
-      senderAddress: sender,
-      address: recipient,
-      from: paraSpellChainMap[originChain.slug],
-      to: paraSpellChainMap[destinationChain.slug],
-      currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
-    };
-    const response = await fetch(paraSpellApi.dryRunXcm, {
-      method: 'POST',
-      body: JSON.stringify(bodyData),
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-        'X-API-KEY': paraSpellKey
+  const bodyData = {
+    senderAddress: sender,
+    address: recipient,
+    from: paraSpellChainMap[originChain.slug],
+    to: paraSpellChainMap[destinationChain.slug],
+    currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
+  };
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunXcm, {
+    method: 'POST',
+    body: JSON.stringify(bodyData),
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json'
+    }
+  });
+  if (!response.ok) {
+    const error = await response.json();
+    return {
+      origin: {
+        success: false,
+        failureReason: error.message
       }
-    });
-    dryRunInfo = await response.json();
-  } catch (e) {
-    console.error('Unable to dry run', e);
-  }
-  if (!dryRunInfo || !dryRunInfo.success) {
-    throw new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again');
+    };
   }
-  return dryRunInfo;
+  return await response.json();
 }
-async function dryRunXcmV2(request) {
-  var _originTokenInfo$meta5, _originTokenInfo$meta6;
+async function estimateXcmFee(request) {
+  var _fromTokenInfo$metada, _fromTokenInfo$metada2;
   const {
-    destinationChain,
-    originChain,
-    originTokenInfo,
+    fromChainInfo,
+    fromTokenInfo,
     recipient,
     sender,
-    sendingValue
+    toChainInfo,
+    value
   } = request;
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
-  const psAssetType = (_originTokenInfo$meta5 = originTokenInfo.metadata) === null || _originTokenInfo$meta5 === void 0 ? void 0 : _originTokenInfo$meta5.paraSpellAssetType;
-  const psAssetValue = (_originTokenInfo$meta6 = originTokenInfo.metadata) === null || _originTokenInfo$meta6 === void 0 ? void 0 : _originTokenInfo$meta6.paraSpellValue;
+  const psAssetType = (_fromTokenInfo$metada = fromTokenInfo.metadata) === null || _fromTokenInfo$metada === void 0 ? void 0 : _fromTokenInfo$metada.paraSpellAssetType;
+  const psAssetValue = (_fromTokenInfo$metada2 = fromTokenInfo.metadata) === null || _fromTokenInfo$metada2 === void 0 ? void 0 : _fromTokenInfo$metada2.paraSpellValue;
   if (!psAssetType || !psAssetValue) {
-    throw new Error('Token is not support XCM at this time');
+    console.error('Lack of paraspell metadata');
+    return undefined;
   }
   const bodyData = {
     senderAddress: sender,
     address: recipient,
-    from: paraSpellChainMap[originChain.slug],
-    to: paraSpellChainMap[destinationChain.slug],
-    currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
+    from: paraSpellChainMap[fromChainInfo.slug],
+    to: paraSpellChainMap[toChainInfo.slug],
+    currency: createParaSpellCurrency(psAssetType, psAssetValue, value)
   };
-  const response = await fetch(paraSpellApi.dryRunXcm, {
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.feeXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
-    const error = await response.json();
-    throw new Error(error.message);
+    console.error('Failed to request estimate fee');
+    return undefined;
   }
   return await response.json();
 }
 function createParaSpellCurrency(assetType, assetValue, amount) {
   // todo: handle complex conditions for asset has same symbol in a chain: Id, Multi-location, ...
+  // todo: or update all asset to use multi-location
   return {
     [assetType]: assetValue,
     amount

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

@@ -40,13 +40,14 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network', 'jamton'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
   supportBridged: ['rococo_assethub', 'statemint', 'statemine', 'polimec'],
-  bittensor: ['bittensor', 'bittensor_testnet']
+  bittensor: ['bittensor', 'bittensor_testnet'],
+  moonbeam: ['moonbeam', 'moonriver', 'moonbase']
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
 const _BALANCE_TOKEN_GROUP = {
@@ -272,11 +273,11 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
-  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
+  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot', 'jamton'],
   centrifuge: ['centrifuge'],
   disable_transfer: ['crab', 'pangolin']
 };

package/cjs/services/chain-service/handler/CardanoApi.js

@@ -3,20 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CardanoApi = exports.API_KEY = void 0;
+exports.CardanoApi = void 0;
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
 var _types = require("@subwallet/extension-base/services/chain-service/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const API_KEY = {
-  mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
-  testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
-};
-exports.API_KEY = API_KEY;
+// export const API_KEY = {
+//   mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
+//   testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
+// };
+
 class CardanoApi {
   // private api: BlockFrostAPI;
 
@@ -33,7 +34,6 @@ class CardanoApi {
     this.chainSlug = chainSlug;
     this.apiUrl = apiUrl;
     this.isTestnet = isTestnet !== null && isTestnet !== void 0 ? isTestnet : true;
-    this.projectId = isTestnet ? API_KEY.testnet : API_KEY.mainnet;
     this.providerName = providerName || 'unknown';
     // this.api = this.createProvider(isTestnet);
     this.isReadyHandler = (0, _utils2.createPromiseHandler)();
@@ -45,6 +45,9 @@ class CardanoApi {
   get connectionStatus() {
     return this.connectionStatusSubject.getValue();
   }
+  fetchCardano(path, options) {
+    return (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CARDANO, path, options, this.isTestnet);
+  }
   updateConnectionStatus(status) {
     const isConnected = status === _types._ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
@@ -115,12 +118,9 @@ class CardanoApi {
   }
   async getBalanceMap(address) {
     try {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/addresses/${address}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const addressBalance = await response.json();
       return addressBalance.amount;
@@ -131,13 +131,10 @@ class CardanoApi {
   }
   async getUtxos(address, page, limit) {
     try {
-      let url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}/utxos`;
-      url += `?page=${page}&count=${limit}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      let path = `/addresses/${address}/utxos`;
+      path += `?page=${page}&count=${limit}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const utxos = await response.json();
       return utxos;
@@ -148,12 +145,9 @@ class CardanoApi {
   }
   async getSpecificUtxo(txHash) {
     try {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}/utxos`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/txs/${txHash}/utxos`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const utxo = await response.json();
       return utxo;
@@ -164,11 +158,10 @@ class CardanoApi {
   }
   async sendCardanoTxReturnHash(tx) {
     try {
-      const url = this.isTestnet ? 'https://cardano-preprod.blockfrost.io/api/v0/tx/submit' : 'https://cardano-mainnet.blockfrost.io/api/v0/tx/submit';
-      const response = await fetch(url, {
+      const path = '/tx/submit';
+      const response = await this.fetchCardano(path, {
         method: 'POST',
         headers: {
-          Project_id: this.projectId,
           'Content-Type': 'application/cbor'
         },
         body: (0, _utils.cborToBytes)(tx)
@@ -188,12 +181,9 @@ class CardanoApi {
   async getStatusByTxHash(txHash, ttl) {
     const cronTime = 30000;
     return (0, _utils.retryCardanoTxStatus)(async () => {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/txs/${txHash}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const txInfo = await response.json();
       if (txInfo.block && txInfo.hash && txInfo.index >= 0) {

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

@@ -1262,6 +1262,10 @@ class ChainService {
             deprecated = true;
             break;
           }
+          if (defaultChainAsset.slug === storedAssetInfo.slug) {
+            duplicated = true;
+            break;
+          }
         }
         if (!duplicated && !deprecated) {
           mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;

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

@@ -11,7 +11,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.104'; // update this when build chainlist
+const ChainListVersion = '0.2.105'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.bittensorApiKey = exports.BittensorCache = exports.BITTENSOR_API_KEY_9 = exports.BITTENSOR_API_KEY_8 = exports.BITTENSOR_API_KEY_7 = exports.BITTENSOR_API_KEY_6 = exports.BITTENSOR_API_KEY_5 = exports.BITTENSOR_API_KEY_4 = exports.BITTENSOR_API_KEY_3 = exports.BITTENSOR_API_KEY_2 = exports.BITTENSOR_API_KEY_10 = exports.BITTENSOR_API_KEY_1 = void 0;
+exports.default = exports.BittensorCache = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -12,6 +12,7 @@ var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils")
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _basePara = _interopRequireDefault(require("@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para"));
 var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
@@ -21,40 +22,7 @@ var _dtao = require("./dtao");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
-exports.BITTENSOR_API_KEY_1 = BITTENSOR_API_KEY_1;
-const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
-exports.BITTENSOR_API_KEY_2 = BITTENSOR_API_KEY_2;
-const BITTENSOR_API_KEY_3 = process.env.BITTENSOR_API_KEY_3 || '';
-exports.BITTENSOR_API_KEY_3 = BITTENSOR_API_KEY_3;
-const BITTENSOR_API_KEY_4 = process.env.BITTENSOR_API_KEY_4 || '';
-exports.BITTENSOR_API_KEY_4 = BITTENSOR_API_KEY_4;
-const BITTENSOR_API_KEY_5 = process.env.BITTENSOR_API_KEY_5 || '';
-exports.BITTENSOR_API_KEY_5 = BITTENSOR_API_KEY_5;
-const BITTENSOR_API_KEY_6 = process.env.BITTENSOR_API_KEY_6 || '';
-exports.BITTENSOR_API_KEY_6 = BITTENSOR_API_KEY_6;
-const BITTENSOR_API_KEY_7 = process.env.BITTENSOR_API_KEY_7 || '';
-exports.BITTENSOR_API_KEY_7 = BITTENSOR_API_KEY_7;
-const BITTENSOR_API_KEY_8 = process.env.BITTENSOR_API_KEY_8 || '';
-exports.BITTENSOR_API_KEY_8 = BITTENSOR_API_KEY_8;
-const BITTENSOR_API_KEY_9 = process.env.BITTENSOR_API_KEY_9 || '';
-exports.BITTENSOR_API_KEY_9 = BITTENSOR_API_KEY_9;
-const BITTENSOR_API_KEY_10 = process.env.BITTENSOR_API_KEY_10 || '';
-exports.BITTENSOR_API_KEY_10 = BITTENSOR_API_KEY_10;
-function random() {
-  for (var _len = arguments.length, keys = new Array(_len), _key = 0; _key < _len; _key++) {
-    keys[_key] = arguments[_key];
-  }
-  const validKeys = keys.filter(key => key);
-  const randomIndex = Math.floor(Math.random() * validKeys.length);
-  return validKeys[randomIndex];
-}
-const bittensorApiKey = () => {
-  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6, BITTENSOR_API_KEY_7, BITTENSOR_API_KEY_8, BITTENSOR_API_KEY_9, BITTENSOR_API_KEY_10);
-};
-
 /* Fetch data */
-exports.bittensorApiKey = bittensorApiKey;
 class BittensorCache {
   static instance = null;
   cache = null;
@@ -80,13 +48,11 @@ class BittensorCache {
     return this.promise;
   }
   async fetchData() {
-    const apiKey = bittensorApiKey();
     try {
-      const resp = await fetch('https://api.taostats.io/api/validator/latest/v1?limit=50', {
+      const resp = await (0, _utils3.fetchFromProxyService)(_environment.ProxyServiceRoute.BITTENSOR, '/validator/latest/v1?limit=50', {
         method: 'GET',
         headers: {
-          'Content-Type': 'application/json',
-          Authorization: `${apiKey}`
+          'Content-Type': 'application/json'
         }
       });
       if (!resp.ok) {