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

package/cjs/constants/environment.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isProductionMode = exports.BACKEND_PRICE_HISTORY_URL = exports.BACKEND_API_URL = void 0;
+exports.isProductionMode = exports.SW_EXTERNAL_SERVICES_API = exports.BACKEND_PRICE_HISTORY_URL = exports.BACKEND_API_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -14,4 +14,6 @@ exports.isProductionMode = isProductionMode;
 const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');
 exports.BACKEND_API_URL = BACKEND_API_URL;
 const BACKEND_PRICE_HISTORY_URL = process.env.SUBWALLET_PRICE_HISTORY_API || (isProductionMode ? 'https://price-history.subwallet.app/api' : 'https://price-history-dev.subwallet.app/api');
-exports.BACKEND_PRICE_HISTORY_URL = BACKEND_PRICE_HISTORY_URL;
+exports.BACKEND_PRICE_HISTORY_URL = BACKEND_PRICE_HISTORY_URL;
+const SW_EXTERNAL_SERVICES_API = process.env.SW_EXTERNAL_SERVICES_API || (isProductionMode ? 'https://external-services.subwallet.app' : 'https://external-services-dev.subwallet.app');
+exports.SW_EXTERNAL_SERVICES_API = SW_EXTERNAL_SERVICES_API;

package/cjs/koni/background/handlers/Extension.js

@@ -1500,7 +1500,7 @@ class KoniExtension {
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(originNetworkKey, destinationNetworkKey);
     const isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(originNetworkKey, destinationNetworkKey);
     const extrinsicType = _KoniTypes.ExtrinsicType.TRANSFER_XCM;
-    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer);
+    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let xcmFeeDryRun;
@@ -1582,48 +1582,47 @@ class KoniExtension {
         }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
-        if (!(0, _utils6._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
-          return undefined;
-        }
-        const setting = {
-          visible: true
-        };
-        await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
-        const {
-          value: _senderTransferable
-        } = await this.getAddressTransferableBalance({
-          address: from,
-          networkKey: originNetworkKey,
-          token: originTokenInfo.slug
-        });
-        const senderTransferable = BigInt(_senderTransferable);
-        const sendingAmount = BigInt(value);
-        const {
-          value: _receiverDestinationTokenKeepAliveBalance
-        } = await this.getAddressTotalBalance({
-          address: to,
-          networkKey: destinationNetworkKey,
-          token: destinationTokenInfo.slug,
-          extrinsicType
-        });
-        const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
-        if (!(0, _utils6._isNativeToken)(destinationTokenInfo)) {
-          const _receiverNativeTotal = await this.getAddressTotalBalance({
+        if ((0, _utils6._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
+          const setting = {
+            visible: true
+          };
+          await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
+          const {
+            value: _senderTransferable
+          } = await this.getAddressTransferableBalance({
+            address: from,
+            networkKey: originNetworkKey,
+            token: originTokenInfo.slug
+          });
+          const senderTransferable = BigInt(_senderTransferable);
+          const sendingAmount = BigInt(value);
+          const {
+            value: _receiverDestinationTokenKeepAliveBalance
+          } = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
-            token: destinationNativeTokenSlug,
+            token: destinationTokenInfo.slug,
             extrinsicType
           });
-          receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
+          if (!(0, _utils6._isNativeToken)(destinationTokenInfo)) {
+            const _receiverNativeTotal = await this.getAddressTotalBalance({
+              address: to,
+              networkKey: destinationNetworkKey,
+              token: destinationNativeTokenSlug,
+              extrinsicType
+            });
+            receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          }
+          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+          const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+          isSendingTokenSufficient = await (0, _utils._isSufficientToken)(destinationTokenInfo, substrateApi, sufficientChain);
+          const [warning, error] = (0, _transfer.additionalValidateTransferForRecipient)(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
+          // different from sendingTokenInfo being passed in
+          receiverSystemAccountInfo, isSendingTokenSufficient);
+          warning.length && inputTransaction.warnings.push(...warning);
+          error.length && inputTransaction.errors.push(...error);
         }
-        const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
-        const sufficientChain = this.#koniState.chainService.value.sufficientChains;
-        isSendingTokenSufficient = await (0, _utils._isSufficientToken)(destinationTokenInfo, substrateApi, sufficientChain);
-        const [warning, error] = (0, _transfer.additionalValidateTransferForRecipient)(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
-        // different from sendingTokenInfo being passed in
-        receiverSystemAccountInfo, isSendingTokenSufficient);
-        warning.length && inputTransaction.warnings.push(...warning);
-        error.length && inputTransaction.errors.push(...error);
         if (isSubstrateXcm) {
           const isDryRunSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
           if (!isDryRunSuccess) {

package/cjs/packageInfo.js

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

package/cjs/services/balance-service/helpers/subscribe/evm.js

@@ -9,6 +9,7 @@ var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
@@ -24,7 +25,11 @@ function subscribeERC20Interval(_ref) {
     evmApi
   } = _ref;
   const chain = chainInfo.slug;
-  const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.ERC20]);
+  let tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.ERC20]);
+  if (_constants2._BALANCE_CHAIN_GROUP.moonbeam.includes(chain)) {
+    const moonbeamLocal = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
+    tokenList = Object.assign({}, tokenList, moonbeamLocal);
+  }
   const erc20ContractMap = {};
   Object.entries(tokenList).forEach(_ref2 => {
     let [slug, tokenInfo] = _ref2;

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

@@ -146,19 +146,25 @@ exports.createXcmExtrinsicV2 = createXcmExtrinsicV2;
 const dryRunXcmExtrinsicV2 = async request => {
   try {
     const dryRunResult = await (0, _utils.dryRunXcm)(request);
-    const originDryRunResult = dryRunResult.origin;
-    if (originDryRunResult.success) {
-      const destinationDryRunResult = dryRunResult.destination;
-      if (destinationDryRunResult.success) {
-        return true;
+    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;
       }
-
-      // pass dry-run in these cases
-      return (0, _utils.isChainNotSupportDryRun)(destinationDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destinationDryRunResult.failureReason);
+      return true;
     }
 
     // pass dry-run in these cases
-    return (0, _utils.isChainNotSupportDryRun)(originDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunResult.failureReason);
+    return (0, _utils.isChainNotSupportDryRun)(originDryRunRs.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunRs.failureReason);
   } catch (e) {
     return false;
   }

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

@@ -11,17 +11,18 @@ exports.isChainNotSupportDryRun = isChainNotSupportDryRun;
 exports.isChainNotSupportPolkadotApi = isChainNotSupportPolkadotApi;
 exports.isUseTeleportProtocol = isUseTeleportProtocol;
 var _paraspellChainMap = require("@subwallet/extension-base/constants/paraspell-chain-map");
+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/v3';
+const version = '/v3';
 const paraSpellApi = {
-  buildXcm: `${paraSpellEndpoint}/x-transfer`,
-  dryRunXcm: `${paraSpellEndpoint}/dry-run`,
-  feeXcm: `${paraSpellEndpoint}/xcm-fee`
+  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');
@@ -98,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) {
@@ -138,13 +138,12 @@ async function dryRunXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.dryRunXcm, {
+  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',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -182,13 +181,12 @@ async function estimateXcmFee(request) {
     to: paraSpellChainMap[toChainInfo.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, value)
   };
-  const response = await fetch(paraSpellApi.feeXcm, {
+  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) {

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

@@ -41,12 +41,13 @@ const _BALANCE_CHAIN_GROUP = {
   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', 'jamton'],
-  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'],
+  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,7 +273,7 @@ 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'],

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/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) {

package/cjs/services/swap-service/handler/chainflip-handler.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChainflipSwapHandler = exports.CHAINFLIP_BROKER_API = void 0;
+exports.ChainflipSwapHandler = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -12,9 +12,9 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
-var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _environment = require("@subwallet/extension-base/types/environment");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -22,9 +22,10 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 
 const INTERMEDIARY_MAINNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_SEPOLIA;
-const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
-exports.CHAINFLIP_BROKER_API = CHAINFLIP_BROKER_API;
 class ChainflipSwapHandler {
+  // private baseUrl: string;
+  // private assetsUrl: string;
+
   constructor(chainService, balanceService, feeService) {
     let isTestnet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
@@ -36,8 +37,10 @@ class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? _types.SwapProviderId.CHAIN_FLIP_TESTNET : _types.SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.baseUrl = (0, _utils2.getChainflipSwap)(isTestnet);
+    // this.baseUrl = getChainflipSwap(isTestnet);
+    // this.assetsUrl = getAssetsUrl(isTestnet);
   }
+
   get chainService() {
     return this.swapBaseHandler.chainService;
   }
@@ -73,7 +76,7 @@ class ChainflipSwapHandler {
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
-    const receiver = (0, _utils3._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
+    const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
     const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
     const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
@@ -85,23 +88,31 @@ class ChainflipSwapHandler {
     if (processMetadata.destChain !== quoteMetadata.destChain || processMetadata.srcChain !== quoteMetadata.srcChain) {
       throw new Error('Metadata for Chainflip not found');
     }
+    const assetsResponse = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, '/assets', {
+      method: 'GET'
+    }, this.isTestnet);
+    const _allAssets = await assetsResponse.json();
+    const allAssets = _allAssets.assets;
+    const sourceAsset = allAssets.find(asset => asset.network === processMetadata.srcChain && asset.ticker === fromAssetId);
+    const destinationAsset = allAssets.find(asset => asset.network === processMetadata.destChain && asset.ticker === toAssetId);
+    if (!sourceAsset || !destinationAsset) {
+      throw new Error('Error get Chainflip data');
+    }
     const depositParams = {
-      sourceChain: processMetadata.srcChain,
       destinationAddress: receiver,
-      destinationAsset: toAssetId,
-      destinationChain: processMetadata.destChain,
+      destinationAsset: destinationAsset.id,
+      sourceAsset: sourceAsset.id,
       minimumPrice: minReceive,
       // minimum accepted price for swaps through the channel
       refundAddress: address,
       // address to which assets are refunded
-      retryDurationInBlocks: '100',
-      // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
-      sourceAsset: fromAssetId
+      retryDurationInBlocks: '100' // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
     };
-    const url = `${this.baseUrl}&${new URLSearchParams(depositParams).toString()}`;
-    const response = await fetch(url, {
+
+    const path = `/swap?${new URLSearchParams(depositParams).toString()}`;
+    const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, path, {
       method: 'GET'
-    });
+    }, this.isTestnet);
     const data = await response.json();
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
@@ -208,8 +219,8 @@ class ChainflipSwapHandler {
         expectedReceive: params.selectedQuote.toAmount,
         originTokenInfo,
         destinationTokenInfo,
-        sender: (0, _utils3._reformatAddressWithChain)(params.request.address, originChain),
-        receiver: (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
+        sender: (0, _utils2._reformatAddressWithChain)(params.request.address, originChain),
+        receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
         version: 2

package/cjs/services/swap-service/handler/kyber-handler.js

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.KyberHandler = exports.KYBER_CLIENT_ID = void 0;
+exports.KyberHandler = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -19,9 +20,6 @@ var _baseHandler = require("./base-handler");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const KYBER_CLIENT_ID = process.env.KYBER_CLIENT_ID || '';
-exports.KYBER_CLIENT_ID = KYBER_CLIENT_ID;
-const kyberUrl = 'https://aggregator-api.kyberswap.com';
 async function buildTxForKyberSwap(params, chain) {
   const {
     recipient,
@@ -46,14 +44,13 @@ async function buildTxForKyberSwap(params, chain) {
     amountIn,
     gasInclude: 'true'
   });
-  const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
+  const path = `/${chain}/api/v1/routes?${queryParams.toString()}`;
   try {
     var _routeData$data;
-    const res = await fetch(url, {
+    const res = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.KYBER, path, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
-        'x-client-id': KYBER_CLIENT_ID,
         accept: 'application/json'
       }
     });
@@ -86,11 +83,10 @@ async function buildTxForKyberSwap(params, chain) {
   };
   console.log('routeSummary2', routeSummary);
   try {
-    const res = await fetch(`${kyberUrl}/${chain}/api/v1/route/build`, {
+    const res = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.KYBER, `/${chain}/api/v1/route/build`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'x-client-id': KYBER_CLIENT_ID,
         accept: 'application/json'
       },
       body: JSON.stringify(body)