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

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

@@ -1,13 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _isAcrossBridgeXcm, _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
-import { buildXcm, dryRunXcmV2, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
+import { buildXcm, dryRunXcm, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
 import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens';
 import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
@@ -39,6 +38,8 @@ export const createSnowBridgeExtrinsic = async ({
   }
   return getSnowBridgeEvmTransfer(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
+
+// deprecated
 export const createXcmExtrinsic = async ({
   destinationChain,
   originChain,
@@ -121,37 +122,27 @@ export const createXcmExtrinsicV2 = async request => {
     return await buildXcm(request);
   } catch (e) {
     console.log('createXcmExtrinsicV2 error: ', e);
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if (isChainNotSupportPolkadotApi(errorMessage)) {
-      return createXcmExtrinsic(request);
-    }
     return undefined;
   }
 };
 export const dryRunXcmExtrinsicV2 = async request => {
   try {
-    return await dryRunXcmV2(request);
-  } catch (e) {
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if (isChainNotSupportDryRun(errorMessage) || isChainNotSupportPolkadotApi(errorMessage)) {
-      const xcmTransfer = await createXcmExtrinsicV2(request);
-      if (!xcmTransfer) {
-        return {
-          success: false
-        };
+    const dryRunResult = await dryRunXcm(request);
+    const originDryRunResult = dryRunResult.origin;
+    if (originDryRunResult.success) {
+      const destinationDryRunResult = dryRunResult.destination;
+      if (destinationDryRunResult.success) {
+        return true;
       }
-      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 * XCM_MIN_AMOUNT_RATIO).toString()
-      };
+      // pass dry-run in these cases
+      return isChainNotSupportDryRun(destinationDryRunResult.failureReason) || isChainNotSupportPolkadotApi(destinationDryRunResult.failureReason);
     }
-    return {
-      success: false
-    };
+
+    // pass dry-run in these cases
+    return isChainNotSupportDryRun(originDryRunResult.failureReason) || isChainNotSupportPolkadotApi(originDryRunResult.failureReason);
+  } catch (e) {
+    return false;
   }
 };
 export const createAcrossBridgeExtrinsic = async ({

package/services/balance-service/transfer/xcm/utils.d.ts

@@ -1,14 +1,44 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { CreateXcmExtrinsicProps } from '@subwallet/extension-base/services/balance-service/transfer/xcm/index';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
-export interface DryRunInfo {
-    success: boolean;
-    fee?: string;
+export declare type DryRunNodeFailure = {
+    success: false;
+    failureReason: string;
+};
+export declare type DryRunNodeSuccess = {
+    success: true;
+    fee: string;
+    forwardedXcms: any;
+};
+export declare type DryRunNodeResult = DryRunNodeSuccess | DryRunNodeFailure;
+export declare type DryRunResult = {
+    origin: DryRunNodeResult;
+    destination?: DryRunNodeResult;
+};
+interface GetXcmFeeRequest {
+    sender: string;
+    recipient: string;
+    value: string;
+    fromChainInfo: _ChainInfo;
+    toChainInfo: _ChainInfo;
+    fromTokenInfo: _ChainAsset;
 }
+export declare type XcmFeeType = 'dryRun' | 'paymentInfo';
+export interface XcmFeeDetail {
+    fee: string;
+    currency: string;
+    feeType: XcmFeeType;
+    dryRunError?: string;
+}
+export declare type GetXcmFeeResult = {
+    origin: XcmFeeDetail;
+    destination: XcmFeeDetail;
+};
 export declare function buildXcm(request: CreateXcmExtrinsicProps): Promise<SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
-export declare function dryRunXcmV2(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
+export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunResult>;
+export declare function estimateXcmFee(request: GetXcmFeeRequest): Promise<GetXcmFeeResult | undefined>;
 export declare function isChainNotSupportPolkadotApi(str: string): boolean;
 export declare function isChainNotSupportDryRun(str: string): boolean;
 export declare const STABLE_XCM_VERSION = 3;
 export declare function isUseTeleportProtocol(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, tokenSlug?: string): boolean;
+export {};

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

@@ -1,14 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { fetchParaSpellChainMap } from '@subwallet/extension-base/constants/paraspell-chain-map';
-import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
-const paraSpellEndpoint = 'https://api.lightspell.xyz';
+const paraSpellEndpoint = 'https://api.lightspell.xyz/v3';
 const paraSpellApi = {
   buildXcm: `${paraSpellEndpoint}/x-transfer`,
-  dryRunXcm: `${paraSpellEndpoint}/dry-run`
+  dryRunXcm: `${paraSpellEndpoint}/dry-run`,
+  feeXcm: `${paraSpellEndpoint}/xcm-fee`
 };
 const paraSpellKey = process.env.PARASPELL_API_KEY || '';
 function txHexToSubmittableExtrinsic(api, hex) {
@@ -73,7 +72,7 @@ export 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;
@@ -104,8 +103,6 @@ export async function buildXcm(request) {
   const chainApi = await substrateApi.isReady;
   return txHexToSubmittableExtrinsic(chainApi.api, extrinsicHex);
 }
-
-// dry run can fail due to sender address & amount token
 export async function dryRunXcm(request) {
   var _originTokenInfo$meta3, _originTokenInfo$meta4;
   const {
@@ -120,60 +117,60 @@ export 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 fetch(paraSpellApi.dryRunXcm, {
+    method: 'POST',
+    body: JSON.stringify(bodyData),
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+      'X-API-KEY': paraSpellKey
+    }
+  });
+  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(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again');
+    };
   }
-  return dryRunInfo;
+  return await response.json();
 }
-export async function dryRunXcmV2(request) {
-  var _originTokenInfo$meta5, _originTokenInfo$meta6;
+export async function estimateXcmFee(request) {
+  var _fromTokenInfo$metada, _fromTokenInfo$metada2;
   const {
-    destinationChain,
-    originChain,
-    originTokenInfo,
+    fromChainInfo,
+    fromTokenInfo,
     recipient,
     sender,
-    sendingValue
+    toChainInfo,
+    value
   } = request;
   const paraSpellChainMap = await 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 fetch(paraSpellApi.feeXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
@@ -183,13 +180,14 @@ export async function dryRunXcmV2(request) {
     }
   });
   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/services/chain-service/constants.js

@@ -29,7 +29,7 @@ export 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'],
+  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'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
@@ -258,7 +258,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   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/services/chain-service/index.js

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

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

@@ -5,7 +5,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/services/earning-service/handlers/special.js

@@ -5,7 +5,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
-import { createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetName, _getAssetSymbol, _getChainNativeTokenSlug, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
@@ -217,29 +218,20 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
           const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
           const symbol = altInputTokenInfo.symbol;
           const networkName = altChainInfo.name;
-          const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
-          const id = getId();
-          const feeInfo = await this.state.feeService.subscribeChainFee(id, altChainInfo.slug, 'substrate');
-          const xcmRequest = {
-            sender: address,
-            originTokenInfo: altInputTokenInfo,
-            destinationTokenInfo: inputTokenInfo,
-            sendingValue: bnAmount.toString(),
-            recipient: address,
-            destinationChain: this.chainInfo,
-            originChain: altChainInfo,
-            substrateApi: xcmOriginSubstrateApi,
-            feeInfo
-          };
 
           // TODO: calculate fee for destination chain
-          let xcmFee;
-          const xcmFeeByDryRun = await dryRunXcmExtrinsicV2(xcmRequest);
-          if (xcmFeeByDryRun.fee) {
-            xcmFee = BigN(xcmFeeByDryRun.fee).multipliedBy(XCM_MIN_AMOUNT_RATIO).toFixed(0, 1);
-          } else {
+          const xcmFeeInfo = await estimateXcmFee({
+            fromChainInfo: altChainInfo,
+            fromTokenInfo: altInputTokenInfo,
+            toChainInfo: this.chainInfo,
+            recipient: address,
+            sender: address,
+            value: bnAmount.toString()
+          });
+          if (!xcmFeeInfo) {
             throw new Error('Error estimating XCM fee');
           }
+          const xcmFee = BigN(xcmFeeInfo.origin.fee).multipliedBy(XCM_MIN_AMOUNT_RATIO).toFixed(0, 1);
           const fee = {
             slug: altInputTokenSlug,
             amount: xcmFee

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

@@ -7,8 +7,9 @@ import { validateSpendingAndFeePayment } from '@subwallet/extension-base/core/lo
 import { _isAccountActive } from '@subwallet/extension-base/core/substrate/system-pallet';
 import { _isAcrossBridgeXcm, _isSnowBridgeXcm, _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
-import { createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _isAcrossChainBridge, AcrossErrorMsg } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
+import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _getAssetDecimals, _getAssetOriginChain, _getAssetSymbol, _getChainNativeTokenSlug, _getTokenMinAmount, _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_EXCESS_AMOUNT_WEIGHT, FEE_RATE_MULTIPLIER } from '@subwallet/extension-base/services/swap-service/utils';
 import { BasicTxErrorType, SwapStepType, TransferTxErrorType } from '@subwallet/extension-base/types';
@@ -121,11 +122,15 @@ export class SwapBaseHandler {
       };
 
       // TODO: calculate fee for destination chain
-      const bridgeFeeByDryRun = await dryRunXcmExtrinsicV2(xcmRequest);
-      if (!bridgeFeeByDryRun.fee) {
-        return undefined;
-      }
-      const estimatedBridgeFee = BigN(bridgeFeeByDryRun.fee).multipliedBy(FEE_RATE_MULTIPLIER.medium).toFixed(0, 1);
+      const xcmFeeInfo = await estimateXcmFee({
+        fromChainInfo: xcmRequest.originChain,
+        fromTokenInfo: xcmRequest.originTokenInfo,
+        toChainInfo: xcmRequest.destinationChain,
+        recipient: xcmRequest.recipient,
+        sender: xcmRequest.sender,
+        value: xcmRequest.sendingValue
+      });
+      const estimatedBridgeFee = BigN((xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee) || '0').multipliedBy(FEE_RATE_MULTIPLIER.medium).toFixed(0, 1);
       const fee = {
         feeComponent: [{
           feeType: SwapFeeType.NETWORK_FEE,

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

@@ -14,44 +14,59 @@ 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 buildTxForSwap(params, chain) {
+async function buildTxForKyberSwap(params, chain) {
   const {
     recipient,
     sender,
     slippageTolerance
   } = params;
   let routeSummary = params.routeSummary;
+  console.log('routeSummary1', routeSummary);
   if (!routeSummary || !routeSummary.tokenIn || !routeSummary.tokenOut || !routeSummary.amountIn) {
-    const queryParams = new URLSearchParams({
-      tokenIn: routeSummary.tokenIn,
-      tokenOut: routeSummary.tokenOut,
-      amountIn: routeSummary.amountIn,
-      gasInclude: 'true'
-    });
-    const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
-    try {
-      var _routeData$data;
-      const res = await fetch(url, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-          'x-client-id': KYBER_CLIENT_ID,
-          accept: 'application/json'
-        }
-      });
-      const routeData = await res.json();
-      if (!routeData.success || !((_routeData$data = routeData.data) !== null && _routeData$data !== void 0 && _routeData$data.routeSummary)) {
-        return {
-          error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, routeData.message)
-        };
+    return {
+      error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'Invalid Route Summary')
+    };
+  }
+  const {
+    amountIn,
+    tokenIn,
+    tokenOut
+  } = routeSummary;
+  const queryParams = new URLSearchParams({
+    tokenIn,
+    tokenOut,
+    amountIn,
+    gasInclude: 'true'
+  });
+  const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
+  try {
+    var _routeData$data;
+    const res = await fetch(url, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-client-id': KYBER_CLIENT_ID,
+        accept: 'application/json'
       }
-      routeSummary = routeData.data.routeSummary;
-    } catch (error) {
-      console.error('Error:', error);
+    });
+    if (!res.ok) {
+      const errorText = await res.text();
+      return {
+        error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, `Fetch Kyber routes failed: ${errorText}`)
+      };
+    }
+    const routeData = await res.json();
+    if (!((_routeData$data = routeData.data) !== null && _routeData$data !== void 0 && _routeData$data.routeSummary)) {
       return {
-        error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR)
+        error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, routeData.message)
       };
     }
+    routeSummary = routeData.data.routeSummary;
+  } catch (error) {
+    console.error('Error:', error);
+    return {
+      error: new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'Unable to build Kyber swap transaction')
+    };
   }
   const body = {
     routeSummary,
@@ -61,6 +76,7 @@ async function buildTxForSwap(params, chain) {
     ignoreCappedSlippage: true,
     enableGasEstimation: true
   };
+  console.log('routeSummary2', routeSummary);
   try {
     const res = await fetch(`${kyberUrl}/${chain}/api/v1/route/build`, {
       method: 'POST',
@@ -272,7 +288,7 @@ export class KyberHandler {
     const recipient = _reformatAddressWithChain((_params$recipient = params.recipient) !== null && _params$recipient !== void 0 ? _params$recipient : sender, toChainInfo);
     const metadata = params.quote.metadata;
     const slippageTolerance = params.slippage * 10000;
-    const rawTx = await buildTxForSwap({
+    const rawTx = await buildTxForKyberSwap({
       routeSummary: metadata.routeSummary,
       sender: params.address,
       recipient,