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

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

@@ -3,13 +3,16 @@
 
 import { cborToBytes, retryCardanoTxStatus } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { createPromiseHandler } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { createPromiseHandler, fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 import { hexAddPrefix, isHex } from '@polkadot/util';
-export const API_KEY = {
-  mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
-  testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
-};
+
+// export const API_KEY = {
+//   mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
+//   testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
+// };
+
 export class CardanoApi {
   // private api: BlockFrostAPI;
 
@@ -25,7 +28,6 @@ export 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 = createPromiseHandler();
@@ -37,6 +39,9 @@ export class CardanoApi {
   get connectionStatus() {
     return this.connectionStatusSubject.getValue();
   }
+  fetchCardano(path, options) {
+    return fetchFromProxyService(ProxyServiceRoute.CARDANO, path, options, this.isTestnet);
+  }
   updateConnectionStatus(status) {
     const isConnected = status === _ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
@@ -107,12 +112,9 @@ export 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;
@@ -123,13 +125,10 @@ export 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;
@@ -140,12 +139,9 @@ export 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;
@@ -156,11 +152,10 @@ export 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: cborToBytes(tx)
@@ -180,12 +175,9 @@ export class CardanoApi {
   async getStatusByTxHash(txHash, ttl) {
     const cronTime = 30000;
     return 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/services/earning-service/handlers/native-staking/tao.d.ts

@@ -37,17 +37,6 @@ interface Validator {
     take: string;
     apr: string;
 }
-export declare const BITTENSOR_API_KEY_1: string;
-export declare const BITTENSOR_API_KEY_2: string;
-export declare const BITTENSOR_API_KEY_3: string;
-export declare const BITTENSOR_API_KEY_4: string;
-export declare const BITTENSOR_API_KEY_5: string;
-export declare const BITTENSOR_API_KEY_6: string;
-export declare const BITTENSOR_API_KEY_7: string;
-export declare const BITTENSOR_API_KEY_8: string;
-export declare const BITTENSOR_API_KEY_9: string;
-export declare const BITTENSOR_API_KEY_10: string;
-export declare const bittensorApiKey: () => string;
 export declare class BittensorCache {
     private static instance;
     private cache;

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

@@ -8,31 +8,13 @@ import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/ap
 import { _getAssetDecimals, _getAssetSymbol } from '@subwallet/extension-base/services/chain-service/utils';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BasicTxErrorType, EarningStatus } from '@subwallet/extension-base/types';
-import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { fetchFromProxyService, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { calculateReward } from "../../utils/index.js";
 import { DEFAULT_DTAO_MINBOND } from "./dtao.js";
-export const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
-export const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
-export const BITTENSOR_API_KEY_3 = process.env.BITTENSOR_API_KEY_3 || '';
-export const BITTENSOR_API_KEY_4 = process.env.BITTENSOR_API_KEY_4 || '';
-export const BITTENSOR_API_KEY_5 = process.env.BITTENSOR_API_KEY_5 || '';
-export const BITTENSOR_API_KEY_6 = process.env.BITTENSOR_API_KEY_6 || '';
-export const BITTENSOR_API_KEY_7 = process.env.BITTENSOR_API_KEY_7 || '';
-export const BITTENSOR_API_KEY_8 = process.env.BITTENSOR_API_KEY_8 || '';
-export const BITTENSOR_API_KEY_9 = process.env.BITTENSOR_API_KEY_9 || '';
-export const BITTENSOR_API_KEY_10 = process.env.BITTENSOR_API_KEY_10 || '';
-function random(...keys) {
-  const validKeys = keys.filter(key => key);
-  const randomIndex = Math.floor(Math.random() * validKeys.length);
-  return validKeys[randomIndex];
-}
-export 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 */
 export class BittensorCache {
   static instance = null;
@@ -59,13 +41,11 @@ export 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 fetchFromProxyService(ProxyServiceRoute.BITTENSOR, '/validator/latest/v1?limit=50', {
         method: 'GET',
         headers: {
-          'Content-Type': 'application/json',
-          Authorization: `${apiKey}`
+          'Content-Type': 'application/json'
         }
       });
       if (!resp.ok) {

package/services/swap-service/handler/chainflip-handler.d.ts

@@ -5,12 +5,10 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import FeeService from '@subwallet/extension-base/services/fee-service/service';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { BaseStepDetail, CommonOptimalSwapPath, CommonStepFeeInfo, OptimalSwapPathParamsV2, SwapProviderId, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types';
-export declare const CHAINFLIP_BROKER_API: string;
 export declare class ChainflipSwapHandler implements SwapBaseInterface {
     private readonly isTestnet;
     private swapBaseHandler;
     providerSlug: SwapProviderId;
-    private baseUrl;
     constructor(chainService: ChainService, balanceService: BalanceService, feeService: FeeService, isTestnet?: boolean);
     get chainService(): ChainService;
     get balanceService(): BalanceService;

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

@@ -8,15 +8,17 @@ import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/e
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { _getAssetSymbol, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
-import { getChainflipSwap } from '@subwallet/extension-base/services/swap-service/utils';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
-import { _reformatAddressWithChain } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { _reformatAddressWithChain, fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigNumber from 'bignumber.js';
 const INTERMEDIARY_MAINNET_ASSET_SLUG = COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = COMMON_ASSETS.USDC_SEPOLIA;
-export const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
 export class ChainflipSwapHandler {
+  // private baseUrl: string;
+  // private assetsUrl: string;
+
   constructor(chainService, balanceService, feeService, isTestnet = true) {
     this.swapBaseHandler = new SwapBaseHandler({
       chainService,
@@ -27,8 +29,10 @@ export class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? SwapProviderId.CHAIN_FLIP_TESTNET : SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.baseUrl = getChainflipSwap(isTestnet);
+    // this.baseUrl = getChainflipSwap(isTestnet);
+    // this.assetsUrl = getAssetsUrl(isTestnet);
   }
+
   get chainService() {
     return this.swapBaseHandler.chainService;
   }
@@ -76,23 +80,31 @@ export class ChainflipSwapHandler {
     if (processMetadata.destChain !== quoteMetadata.destChain || processMetadata.srcChain !== quoteMetadata.srcChain) {
       throw new Error('Metadata for Chainflip not found');
     }
+    const assetsResponse = await fetchFromProxyService(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 fetchFromProxyService(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');

package/services/swap-service/handler/kyber-handler.d.ts

@@ -8,7 +8,6 @@ import { SwapBaseInterface } from './base-handler';
 export interface KyberSwapQuoteMetadata {
     priceImpact?: string;
 }
-export declare const KYBER_CLIENT_ID: string;
 export declare class KyberHandler implements SwapBaseInterface {
     private swapBaseHandler;
     transactionService: TransactionService;

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

@@ -6,14 +6,13 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { estimateTxFee, getERC20Allowance, getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
-import { _reformatAddressWithChain, combineEthFee } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { _reformatAddressWithChain, combineEthFee, fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigNumber from 'bignumber.js';
 import { _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken } from "../../chain-service/utils/index.js";
 import { calculateGasFeeParams } from "../../fee-service/utils/index.js";
 import { SwapBaseHandler } from "./base-handler.js";
-export const KYBER_CLIENT_ID = process.env.KYBER_CLIENT_ID || '';
-const kyberUrl = 'https://aggregator-api.kyberswap.com';
 async function buildTxForKyberSwap(params, chain) {
   const {
     recipient,
@@ -38,14 +37,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 fetchFromProxyService(ProxyServiceRoute.KYBER, path, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
-        'x-client-id': KYBER_CLIENT_ID,
         accept: 'application/json'
       }
     });
@@ -78,11 +76,10 @@ async function buildTxForKyberSwap(params, chain) {
   };
   console.log('routeSummary2', routeSummary);
   try {
-    const res = await fetch(`${kyberUrl}/${chain}/api/v1/route/build`, {
+    const res = await fetchFromProxyService(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)

package/services/swap-service/handler/simpleswap-handler.d.ts

@@ -4,7 +4,6 @@ import { BaseStepDetail, CommonOptimalSwapPath, CommonStepFeeInfo, OptimalSwapPa
 import { BalanceService } from '../../balance-service';
 import { ChainService } from '../../chain-service';
 import { SwapBaseInterface } from './base-handler';
-export declare const simpleSwapApiKey: string;
 export declare class SimpleSwapHandler implements SwapBaseInterface {
     private swapBaseHandler;
     providerSlug: SwapProviderId;

package/services/swap-service/handler/simpleswap-handler.js

@@ -6,14 +6,13 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getAssetDecimals, _getAssetSymbol, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
-import { _reformatAddressWithChain, formatNumber } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { _reformatAddressWithChain, fetchFromProxyService, formatNumber } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigN, { BigNumber } from 'bignumber.js';
 import { getERC20TransactionObject, getEVMTransactionObject } from "../../balance-service/transfer/smart-contract.js";
 import { createSubstrateExtrinsic } from "../../balance-service/transfer/token.js";
 import { SwapBaseHandler } from "./base-handler.js";
-const apiUrl = 'https://api.simpleswap.io/v3';
-export const simpleSwapApiKey = process.env.SIMPLE_SWAP_API_KEY || '';
 const toBNString = (input, decimal) => {
   const raw = new BigNumber(input);
   return raw.shiftedBy(decimal).integerValue(BigNumber.ROUND_CEIL).toFixed();
@@ -45,12 +44,11 @@ const buildTxForSimpleSwap = async params => {
       userRefundAddress: sender,
       userRefundExtraId: ''
     };
-    const response = await fetch(`${apiUrl}/exchanges`, {
+    const response = await fetchFromProxyService(ProxyServiceRoute.SIMPLESWAP, '/exchanges', {
       method: 'POST',
       headers: {
-        accept: 'application/json',
         'Content-Type': 'application/json',
-        'x-api-key': simpleSwapApiKey
+        accept: 'application/json'
       },
       body: JSON.stringify(requestBody)
     });

package/services/swap-service/handler/uniswap-handler.js

@@ -9,16 +9,13 @@ import { createAcrossBridgeExtrinsic } from '@subwallet/extension-base/services/
 import { getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { DEFAULT_EXCESS_AMOUNT_WEIGHT, FEE_RATE_MULTIPLIER } from '@subwallet/extension-base/services/swap-service/utils';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, FeeOptionKey, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
-import { _reformatAddressWithChain } from '@subwallet/extension-base/utils';
+import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
+import { _reformatAddressWithChain, fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigNumber from 'bignumber.js';
 import { _getAssetOriginChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getEvmChainId, _isNativeToken } from "../../chain-service/utils/index.js";
 import { calculateGasFeeParams } from "../../fee-service/utils/index.js";
 import { SwapBaseHandler } from "./base-handler.js";
-const API_URL = 'https://trade-api.gateway.uniswap.org/v1';
-const headers = {
-  'x-api-key': process.env.UNISWAP_API_KEY || ''
-};
 async function fetchCheckApproval(request) {
   const {
     address,
@@ -49,10 +46,9 @@ async function fetchCheckApproval(request) {
   } else {
     return undefined;
   }
-  const response = await fetch(`${API_URL}/check_approval`, {
+  const response = await fetchFromProxyService(ProxyServiceRoute.UNISWAP, '/check_approval', {
     method: 'POST',
     headers: {
-      ...headers,
       'Content-Type': 'application/json'
     },
     body: JSON.stringify({
@@ -617,10 +613,9 @@ export class UniswapHandler {
       if (permitData) {
         body.permitData = permitData;
       }
-      postTransactionResponse = await fetch(`${API_URL}/swap`, {
+      postTransactionResponse = await fetchFromProxyService(ProxyServiceRoute.UNISWAP, '/swap', {
         method: 'POST',
         headers: {
-          ...headers,
           'Content-Type': 'application/json'
         },
         body: JSON.stringify(body)
@@ -631,10 +626,9 @@ export class UniswapHandler {
       const dutchQuote = quote;
       const submitSwapOrder = async () => {
         try {
-          const res = await fetch(`${API_URL}/order`, {
+          const res = await fetchFromProxyService(ProxyServiceRoute.UNISWAP, '/order', {
             method: 'POST',
             headers: {
-              ...headers,
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
@@ -675,10 +669,9 @@ export class UniswapHandler {
         const swapper = dutchQuote.orderInfo.swapper;
         return retryGetUniswapTx(async () => {
           try {
-            const response = await fetch(`${API_URL}/orders?orderId=${orderId}&swapper=${swapper}`, {
+            const response = await fetchFromProxyService(ProxyServiceRoute.UNISWAP, `/orders?orderId=${orderId}&swapper=${swapper}`, {
               method: 'GET',
               headers: {
-                ...headers,
                 'Content-Type': 'application/json'
               }
             });

package/services/swap-service/utils.d.ts

@@ -13,19 +13,6 @@ export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | un
 export declare function getSwapAltToken(chainAsset: _ChainAsset): string | undefined;
 export declare function calculateSwapRate(fromAmount: string, toAmount: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
 export declare function convertSwapRate(rate: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
-export declare function getChainflipOptions(isTestnet: boolean): {
-    network: string;
-    broker?: undefined;
-} | {
-    network: string;
-    broker: {
-        url: string;
-    };
-};
-export declare function getChainflipBroker(isTestnet: boolean): {
-    url: string;
-};
-export declare function getChainflipSwap(isTestnet: boolean): string;
 export declare function getBridgeStep(from: string, to: string): DynamicSwapAction;
 export declare function getSwapStep(from: string, to: string): DynamicSwapAction;
 export declare function findBridgeTransitDestination(assetRefMap: Record<string, _AssetRef>, fromToken: _ChainAsset, toToken: _ChainAsset): string | undefined;

package/services/swap-service/utils.js

@@ -4,7 +4,6 @@
 import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _AssetRefPath } from '@subwallet/chain-list/types';
 import { _getAssetDecimals, _getAssetOriginChain, _getOriginChainOfAsset, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
-import { CHAINFLIP_BROKER_API } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { CommonStepType, DynamicSwapType, SwapStepType } from '@subwallet/extension-base/types';
 import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
@@ -70,39 +69,52 @@ export function convertSwapRate(rate, fromAsset, toAsset) {
   const bnRate = BigN(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
 }
-export function getChainflipOptions(isTestnet) {
-  if (isTestnet) {
-    return {
-      network: getChainflipNetwork(isTestnet)
-    };
-  }
-  return {
-    network: getChainflipNetwork(isTestnet),
-    broker: getChainflipBroker(isTestnet)
-  };
-}
-function getChainflipNetwork(isTestnet) {
-  return isTestnet ? 'perseverance' : 'mainnet';
-}
-export function getChainflipBroker(isTestnet) {
-  // noted: currently not use testnet broker
-  if (isTestnet) {
-    return {
-      url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
-    };
-  } else {
-    return {
-      url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
-    };
-  }
-}
-export function getChainflipSwap(isTestnet) {
-  if (isTestnet) {
-    return `https://perseverance.chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
-  } else {
-    return `https://chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
-  }
-}
+
+// export function getChainflipOptions (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return {
+//       network: getChainflipNetwork(isTestnet)
+//     };
+//   }
+
+//   return {
+//     network: getChainflipNetwork(isTestnet),
+//     broker: getChainflipBroker(isTestnet)
+//   };
+// }
+
+// function getChainflipNetwork (isTestnet: boolean) {
+//   return isTestnet ? 'perseverance' : 'mainnet';
+// }
+
+// export function getChainflipBroker (isTestnet: boolean) { // noted: currently not use testnet broker
+//   if (isTestnet) {
+//     return {
+//       url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   } else {
+//     return {
+//       url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   }
+// }
+
+// export function getChainflipSwap (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return `https://perseverance.chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   } else {
+//     return `https://chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   }
+// }
+
+// export function getAssetsUrl (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return 'https://perseverance.chainflip-broker.io/assets';
+//   } else {
+//     return 'https://chainflip-broker.io/assets';
+//   }
+// }
+
 export function getBridgeStep(from, to) {
   return {
     action: DynamicSwapType.BRIDGE,

package/types/environment.d.ts

@@ -0,0 +1,9 @@
+export declare enum ProxyServiceRoute {
+    BITTENSOR = "/bittensor",
+    CHAINFLIP = "/chainflip",
+    KYBER = "/kyber",
+    SIMPLESWAP = "/simpleswap",
+    UNISWAP = "/uniswap",
+    CARDANO = "/cardano",
+    PARASPELL = "/paraspell"
+}

package/types/environment.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export let ProxyServiceRoute;
+(function (ProxyServiceRoute) {
+  ProxyServiceRoute["BITTENSOR"] = "/bittensor";
+  ProxyServiceRoute["CHAINFLIP"] = "/chainflip";
+  ProxyServiceRoute["KYBER"] = "/kyber";
+  ProxyServiceRoute["SIMPLESWAP"] = "/simpleswap";
+  ProxyServiceRoute["UNISWAP"] = "/uniswap";
+  ProxyServiceRoute["CARDANO"] = "/cardano";
+  ProxyServiceRoute["PARASPELL"] = "/paraspell";
+})(ProxyServiceRoute || (ProxyServiceRoute = {}));

package/utils/environment.d.ts

@@ -1,5 +1,6 @@
 import Bowser from 'bowser';
 import { EnvironmentSupport, RuntimeEnvironmentInfo, TargetEnvironment } from '../background/KoniTypes';
+import { ProxyServiceRoute } from '../types/environment';
 export declare const RuntimeInfo: RuntimeEnvironmentInfo;
 export declare const BowserParser: Bowser.Parser.Parser;
 export declare const isBrave: boolean;
@@ -16,3 +17,4 @@ export declare const targetIsExtension: boolean;
 export declare const targetIsWeb: boolean;
 export declare const targetIsMobile: boolean;
 export declare const MODULE_SUPPORT: EnvironmentSupport;
+export declare function fetchFromProxyService(service: ProxyServiceRoute, path: string, options: RequestInit, isTestnet?: boolean): Promise<Response>;

package/utils/environment.js

@@ -5,6 +5,7 @@ var _navigator3;
 import { isSupportWindow } from '@subwallet/extension-base/utils/mv3';
 import Bowser from 'bowser';
 import { RuntimeEnvironment } from "../background/KoniTypes.js";
+import { SW_EXTERNAL_SERVICES_API } from "../constants/index.js";
 function detectRuntimeEnvironment() {
   if (isSupportWindow && typeof document !== 'undefined') {
     var _navigator, _window$location, _window$location2;
@@ -84,4 +85,29 @@ export const targetIsWeb = TARGET_ENV === 'webapp';
 export const targetIsMobile = TARGET_ENV === 'mobile';
 export const MODULE_SUPPORT = {
   MANTA_ZK: false
-};
+};
+var HEADERS;
+(function (HEADERS) {
+  HEADERS["PLATFORM"] = "Platform";
+})(HEADERS || (HEADERS = {}));
+function formatExternalServiceApi(url, isTestnet) {
+  if (isTestnet === true) {
+    return `${url}/testnet`;
+  }
+  if (isTestnet === false) {
+    return `${url}/mainnet`;
+  }
+  return url;
+}
+export async function fetchFromProxyService(service, path, options, isTestnet) {
+  const baseUrl = formatExternalServiceApi(`${SW_EXTERNAL_SERVICES_API}${service}`, isTestnet);
+  const url = `${baseUrl}${path}`;
+  const headers = {
+    [HEADERS.PLATFORM]: TARGET_ENV,
+    ...(options.headers || {})
+  };
+  return fetch(url, {
+    ...options,
+    headers
+  });
+}