@subwallet/extension-base 1.3.61-0 → 1.3.63-0

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

@@ -5,19 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SwapService = void 0;
-var _chainList = require("@subwallet/chain-list");
-var _types = require("@subwallet/chain-list/types");
 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 _constants = require("@subwallet/extension-base/constants");
-var _types2 = require("@subwallet/extension-base/services/base/types");
+var _types = require("@subwallet/extension-base/services/base/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _assetHub = require("@subwallet/extension-base/services/swap-service/handler/asset-hub");
 var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
 var _hydradxHandler = require("@subwallet/extension-base/services/swap-service/handler/hydradx-handler");
+var _optimexHandler = require("@subwallet/extension-base/services/swap-service/handler/optimex-handler");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
-var _types3 = require("@subwallet/extension-base/types");
+var _types2 = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _utils3 = require("@subwallet/extension-base/utils");
@@ -36,7 +35,7 @@ class SwapService {
   handlers = {};
   startPromiseHandler = (0, _utils3.createPromiseHandler)();
   stopPromiseHandler = (0, _utils3.createPromiseHandler)();
-  status = _types2.ServiceStatus.NOT_INITIALIZED;
+  status = _types.ServiceStatus.NOT_INITIALIZED;
   constructor(state) {
     this.state = state;
     this.eventService = state.eventService;
@@ -84,7 +83,7 @@ class SwapService {
       steps: [_serviceBase.DEFAULT_FIRST_STEP],
       path: []
     };
-    const swapPairInfo = params.path.find(action => action.action === _types3.DynamicSwapType.SWAP);
+    const swapPairInfo = params.path.find(action => action.action === _types2.DynamicSwapType.SWAP);
     if (!swapPairInfo) {
       console.error('Swap pair is not found');
       return result;
@@ -114,6 +113,7 @@ class SwapService {
       const providerId = ((_params$request$curre = params.request.currentQuote) === null || _params$request$curre === void 0 ? void 0 : _params$request$curre.id) || params.selectedQuote.provider.id;
       const handler = this.handlers[providerId];
       if (handler) {
+        // todo: handle error response from generateOptimalProcess
         return handler.generateOptimalProcessV2(params);
       } else {
         return this.getDefaultProcessV2(params);
@@ -151,6 +151,12 @@ class SwapService {
     } catch (e) {
       throw new Error(e.message);
     }
+
+    // override fee for quote because some cases need estimate network fee on Extension (i.e. Optimex)
+    if (swapQuoteResponse.optimalQuote) {
+      const swapIndex = optimalProcess.steps.findIndex(step => step.type === _swap.SwapStepType.SWAP);
+      swapQuoteResponse.optimalQuote.feeInfo.feeComponent = optimalProcess.totalFee[swapIndex].feeComponent;
+    }
     if (swapQuoteResponse.error) {
       return {
         process: optimalProcess,
@@ -167,115 +173,6 @@ class SwapService {
       quote: swapQuoteResponse
     };
   }
-
-  // todo: rewrite this function
-  getAvailablePath(request) {
-    const {
-      address,
-      pair
-    } = request;
-    // todo: control provider tighter
-    const supportSwapChains = (0, _utils2.getSupportedSwapChains)();
-    const fromToken = this.chainService.getAssetBySlug(pair.from);
-    const toToken = this.chainService.getAssetBySlug(pair.to);
-    const fromChain = (0, _utils._getAssetOriginChain)(fromToken);
-    const toChain = (0, _utils._getAssetOriginChain)(toToken);
-    const toChainInfo = this.chainService.getChainInfoByKey(toChain);
-    const assetRefMap = this.chainService.getAssetRefMap();
-    let process = [];
-    if (!fromToken || !toToken) {
-      throw Error('Token not found');
-    }
-    if (!fromChain || !toChain) {
-      throw Error('Token metadata error');
-    }
-    const directXcmRef = Object.values(assetRefMap).find(assetRef => assetRef.path === _types._AssetRefPath.XCM && assetRef.srcAsset === fromToken.slug && assetRef.destAsset === toToken.slug);
-    if (directXcmRef) {
-      return [[], undefined];
-    }
-
-    // SWAP: 2 tokens in the same chain and chain has dex
-    if ((0, _utils2.isChainsHasSameProvider)(fromChain, toChain)) {
-      // there's a dex that can support direct swapping
-      process.push((0, _utils2.getSwapStep)(fromToken.slug, toToken.slug));
-      return [process, request];
-    }
-
-    // ------------------------
-    // BRIDGE -> SWAP: Try to find a token in dest chain that can bridge from fromToken
-    const bridgeTransit = (0, _utils2.findBridgeTransitDestination)(assetRefMap, fromToken, toToken);
-    if (bridgeTransit && supportSwapChains.includes(toChain)) {
-      const swapStep = (0, _utils2.getSwapStep)(bridgeTransit, toToken.slug);
-      process.push((0, _utils2.getBridgeStep)(fromToken.slug, bridgeTransit));
-      process.push(swapStep);
-      return [process, {
-        ...request,
-        address: (0, _utils3.reformatAddress)(address, (0, _utils._getChainSubstrateAddressPrefix)(toChainInfo)),
-        pair: swapStep.pair
-      }];
-    }
-
-    // ------------------------
-    // SWAP -> BRIDGE: Try to find a token in from chain that can bridge to toToken
-    const swapTransit = (0, _utils2.findSwapTransitDestination)(assetRefMap, fromToken, toToken);
-    if (swapTransit && supportSwapChains.includes(fromChain)) {
-      const swapStep = (0, _utils2.getSwapStep)(fromToken.slug, swapTransit);
-      process.push(swapStep);
-      process.push((0, _utils2.getBridgeStep)(swapTransit, toToken.slug));
-      return [process, {
-        ...request,
-        pair: swapStep.pair
-      }];
-    }
-
-    // ------------------------
-    // BRIDGE -> SWAP -> BRIDGE: Try to find a tri-step path to swap
-    const processList = [];
-    const swapPairList = [];
-    const allBridgeDestinations = (0, _utils2.findAllBridgeDestinations)(assetRefMap, fromToken);
-
-    // currently find first path. Todo: return all paths or best path.
-    for (const bridgeTransit of allBridgeDestinations) {
-      process = [];
-      const bridgeDestinationInfo = this.chainService.getAssetBySlug(bridgeTransit);
-      const swapTransit = (0, _utils2.findSwapTransitDestination)(assetRefMap, bridgeDestinationInfo, toToken);
-      if (bridgeTransit === swapTransit) {
-        continue;
-      }
-      if (swapTransit && supportSwapChains.includes(bridgeDestinationInfo.originChain)) {
-        const swapStep = (0, _utils2.getSwapStep)(bridgeTransit, swapTransit);
-        process.push((0, _utils2.getBridgeStep)(fromToken.slug, bridgeTransit));
-        process.push(swapStep);
-        process.push((0, _utils2.getBridgeStep)(swapTransit, toToken.slug));
-
-        // set the highest priority to hydration provider
-        if (bridgeDestinationInfo.originChain === _chainList.COMMON_CHAIN_SLUGS.HYDRADX) {
-          return [process, {
-            ...request,
-            address: (0, _utils3._reformatAddressWithChain)(address, this.chainService.getChainInfoByKey(_chainList.COMMON_CHAIN_SLUGS.HYDRADX)),
-            pair: swapStep.pair
-          }];
-        }
-        processList.push(process);
-        swapPairList.push(swapStep.pair);
-      }
-    }
-
-    // get first process
-    if (processList.length && swapPairList.length) {
-      const [firstProcess, firstSwapPair] = [processList[0], swapPairList[0]];
-      const chainSwap = this.chainService.getAssetBySlug(firstSwapPair.from).originChain;
-      return [firstProcess, {
-        ...request,
-        address: (0, _utils3._reformatAddressWithChain)(address, this.chainService.getChainInfoByKey(chainSwap)),
-        pair: firstSwapPair
-      }];
-    }
-
-    // todo: encapsulate each route type to function
-
-    return [[], undefined];
-  }
   async getLatestQuoteFromSwapRequest(request) {
     let availablePath;
     try {
@@ -296,7 +193,7 @@ class SwapService {
     const {
       path
     } = availablePath;
-    const swapAction = path.find(step => step.action === _types3.DynamicSwapType.SWAP);
+    const swapAction = path.find(step => step.action === _types2.DynamicSwapType.SWAP);
     const directSwapRequest = swapAction ? {
       ...request,
       address: (0, _utils3._reformatAddressWithChain)(request.address, this.chainService.getChainInfoByKey((0, _utils._getAssetOriginChain)(this.chainService.getAssetBySlug(swapAction.pair.from)))),
@@ -305,7 +202,7 @@ class SwapService {
     if (!directSwapRequest) {
       throw Error('Swap pair is not found');
     }
-    if (path.length > 1 && path.map(action => action.action).includes(_types3.DynamicSwapType.BRIDGE)) {
+    if (path.length > 1 && path.map(action => action.action).includes(_types2.DynamicSwapType.BRIDGE)) {
       directSwapRequest.isCrossChain = true;
     }
     const swapQuoteResponse = await this.getLatestDirectQuotes(directSwapRequest);
@@ -375,9 +272,6 @@ class SwapService {
         case _swap.SwapProviderId.CHAIN_FLIP_MAINNET:
           this.handlers[providerId] = new _chainflipHandler.ChainflipSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
-        case _swap.SwapProviderId.HYDRADX_TESTNET:
-          this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService);
-          break;
         case _swap.SwapProviderId.HYDRADX_MAINNET:
           this.handlers[providerId] = new _hydradxHandler.HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
@@ -387,12 +281,6 @@ class SwapService {
         case _swap.SwapProviderId.KUSAMA_ASSET_HUB:
           this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'statemine');
           break;
-        // case SwapProviderId.ROCOCO_ASSET_HUB:
-        //   this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'rococo_assethub');
-        //   break;
-        case _swap.SwapProviderId.WESTEND_ASSET_HUB:
-          this.handlers[providerId] = new _assetHub.AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'westend_assethub');
-          break;
         case _swap.SwapProviderId.SIMPLE_SWAP:
           this.handlers[providerId] = new _simpleswapHandler.SimpleSwapHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;
@@ -402,26 +290,32 @@ class SwapService {
         case _swap.SwapProviderId.KYBER:
           this.handlers[providerId] = new _kyberHandler.KyberHandler(this.chainService, this.state.balanceService, this.state.transactionService, this.state.feeService);
           break;
+        case _swap.SwapProviderId.OPTIMEX:
+          this.handlers[providerId] = new _optimexHandler.OptimexHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
+          break;
+        case _swap.SwapProviderId.OPTIMEX_TESTNET:
+          this.handlers[providerId] = new _optimexHandler.OptimexHandler(this.chainService, this.state.balanceService, this.state.feeService, true);
+          break;
         default:
           throw new Error('Unsupported provider');
       }
     });
   }
   async init() {
-    this.status = _types2.ServiceStatus.INITIALIZING;
+    this.status = _types.ServiceStatus.INITIALIZING;
     this.eventService.emit('swap.ready', true);
-    this.status = _types2.ServiceStatus.INITIALIZED;
+    this.status = _types.ServiceStatus.INITIALIZED;
     this.initHandlers();
     await this.start();
   }
   async start() {
-    if (this.status === _types2.ServiceStatus.STOPPING) {
+    if (this.status === _types.ServiceStatus.STOPPING) {
       await this.waitForStopped();
     }
-    if (this.status === _types2.ServiceStatus.STARTED || this.status === _types2.ServiceStatus.STARTING) {
+    if (this.status === _types.ServiceStatus.STARTED || this.status === _types.ServiceStatus.STARTING) {
       return this.waitForStarted();
     }
-    this.status = _types2.ServiceStatus.STARTING;
+    this.status = _types.ServiceStatus.STARTING;
 
     // todo: start the service jobs, subscribe data,...
 
@@ -430,13 +324,13 @@ class SwapService {
     // Update promise handler
     this.startPromiseHandler.resolve();
     this.stopPromiseHandler = (0, _utils3.createPromiseHandler)();
-    this.status = _types2.ServiceStatus.STARTED;
+    this.status = _types.ServiceStatus.STARTED;
   }
   async stop() {
-    if (this.status === _types2.ServiceStatus.STARTING) {
+    if (this.status === _types.ServiceStatus.STARTING) {
       await this.waitForStarted();
     }
-    if (this.status === _types2.ServiceStatus.STOPPED || this.status === _types2.ServiceStatus.STOPPING) {
+    if (this.status === _types.ServiceStatus.STOPPED || this.status === _types.ServiceStatus.STOPPING) {
       return this.waitForStopped();
     }
 
@@ -444,7 +338,7 @@ class SwapService {
 
     this.stopPromiseHandler.resolve();
     this.startPromiseHandler = (0, _utils3.createPromiseHandler)();
-    this.status = _types2.ServiceStatus.STOPPED;
+    this.status = _types.ServiceStatus.STOPPED;
   }
   waitForStarted() {
     return this.startPromiseHandler.promise;
@@ -452,6 +346,8 @@ class SwapService {
   waitForStopped() {
     return this.stopPromiseHandler.promise;
   }
+
+  // todo: deprecated
   getSwapPairs() {
     return Object.entries(this.chainService.swapRefMap).map(_ref => {
       let [slug, assetRef] = _ref;
@@ -478,7 +374,7 @@ class SwapService {
     const blockedActionsFeaturesMaps = await (0, _constants.fetchLatestBlockedActionsAndFeatures)(passBlockedConfigId);
     const originSwapPairInfo = (0, _utils2.getTokenPairFromStep)(params.process.steps);
     if (!originSwapPairInfo) {
-      return [new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)];
+      return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR)];
     }
     const currentAction = `${_KoniTypes.ExtrinsicType.SWAP}___${originSwapPairInfo.slug}___${params.selectedQuote.provider.id}`;
     for (const blockedActionsFeaturesMap of blockedActionsFeaturesMaps) {
@@ -486,27 +382,29 @@ class SwapService {
         blockedActionsMap
       } = blockedActionsFeaturesMap;
       if (blockedActionsMap.swap.includes(currentAction)) {
-        return [new _TransactionError.TransactionError(_types3.BasicTxErrorType.UNSUPPORTED, (0, _i18next.t)('bg.SWAP.services.service.swap.featureUnderMaintenance'))];
+        return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.UNSUPPORTED, (0, _i18next.t)('bg.SWAP.services.service.swap.featureUnderMaintenance'))];
       }
     }
     if (handler) {
       return handler.validateSwapProcessV2(params);
     } else {
-      return [new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)];
+      return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR)];
     }
   }
   async handleSwapProcess(params) {
     const handler = this.handlers[params.quote.provider.id];
     if (params.process.steps.length === 1) {
       // todo: do better to handle error generating steps
-      return Promise.reject(new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR, 'Please check your network and try again'));
+      return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR, 'Please check your network and try again'));
     }
     if (handler) {
       return handler.handleSwapProcess(params);
     } else {
-      return Promise.reject(new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR));
+      return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR));
     }
   }
+
+  // todo: deprecated
   subscribeSwapPairs(callback) {
     return this.chainService.subscribeSwapRefMap().subscribe(refMap => {
       const latestData = Object.entries(refMap).map(_ref2 => {

package/cjs/services/swap-service/utils.js

@@ -4,29 +4,18 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.SIMPLE_SWAP_EXPLORER = exports.FEE_RATE_MULTIPLIER = exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
-exports.calculateSwapRate = calculateSwapRate;
-exports.convertSwapRate = convertSwapRate;
-exports.findAllBridgeDestinations = findAllBridgeDestinations;
-exports.findBridgeTransitDestination = findBridgeTransitDestination;
-exports.findSwapTransitDestination = findSwapTransitDestination;
+exports.SWAP_QUOTE_TIMEOUT_MAP = exports.SIMPLE_SWAP_EXPLORER = exports.FEE_RATE_MULTIPLIER = exports.DetectedGenOptimalProcessErrMsg = exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.getAmountAfterSlippage = getAmountAfterSlippage;
-exports.getBridgeStep = getBridgeStep;
 exports.getChainRouteFromSteps = getChainRouteFromSteps;
 exports.getFirstAmountFromSteps = getFirstAmountFromSteps;
 exports.getLastAmountFromSteps = getLastAmountFromSteps;
-exports.getSupportedSwapChains = getSupportedSwapChains;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
 exports.getSwapChainsFromPath = getSwapChainsFromPath;
-exports.getSwapStep = getSwapStep;
 exports.getTokenPairFromStep = getTokenPairFromStep;
-exports.isChainsHasSameProvider = isChainsHasSameProvider;
 exports.processStepsToPathActions = processStepsToPathActions;
-var _chainList = require("@subwallet/chain-list");
-var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _types2 = require("@subwallet/extension-base/types");
+var _types = require("@subwallet/extension-base/types");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -37,17 +26,7 @@ exports.CHAIN_FLIP_TESTNET_EXPLORER = CHAIN_FLIP_TESTNET_EXPLORER;
 const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 exports.CHAIN_FLIP_MAINNET_EXPLORER = CHAIN_FLIP_MAINNET_EXPLORER;
 const SIMPLE_SWAP_EXPLORER = 'https://simpleswap.io';
-
-// Deprecated
 exports.SIMPLE_SWAP_EXPLORER = SIMPLE_SWAP_EXPLORER;
-const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
-  'bittensor-NATIVE-TAO': 'tao',
-  [_chainList.COMMON_ASSETS.ETH]: 'eth',
-  [_chainList.COMMON_ASSETS.DOT]: 'dot',
-  [_chainList.COMMON_ASSETS.USDC_ETHEREUM]: 'usdc',
-  [_chainList.COMMON_ASSETS.USDT_ETHEREUM]: 'usdterc20'
-};
-exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING;
 const SWAP_QUOTE_TIMEOUT_MAP = {
   // in milliseconds
   default: 90000,
@@ -55,32 +34,13 @@ const SWAP_QUOTE_TIMEOUT_MAP = {
   [_swap.SwapProviderId.CHAIN_FLIP_MAINNET]: 30000,
   error: 10000
 };
-
-// deprecated
 exports.SWAP_QUOTE_TIMEOUT_MAP = SWAP_QUOTE_TIMEOUT_MAP;
-const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
-  [_swap.SwapProviderId.HYDRADX_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX],
-  [_swap.SwapProviderId.CHAIN_FLIP_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.ARBITRUM],
-  [_swap.SwapProviderId.POLKADOT_ASSET_HUB]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
-  [_swap.SwapProviderId.KUSAMA_ASSET_HUB]: [_chainList.COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],
-  [_swap.SwapProviderId.SIMPLE_SWAP]: ['bittensor', _chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.POLKADOT],
-  [_swap.SwapProviderId.UNISWAP]: [_chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.ARBITRUM],
-  // testnet
-  [_swap.SwapProviderId.CHAIN_FLIP_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
-  [_swap.SwapProviderId.HYDRADX_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
-  [_swap.SwapProviderId.ROCOCO_ASSET_HUB]: [_chainList.COMMON_CHAIN_SLUGS.ROCOCO_ASSET_HUB],
-  [_swap.SwapProviderId.WESTEND_ASSET_HUB]: ['westend_assethub']
-};
-exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = _PROVIDER_TO_SUPPORTED_PAIR_MAP;
 const FEE_RATE_MULTIPLIER = {
   default: 1,
   medium: 1.2,
   high: 2
 };
 exports.FEE_RATE_MULTIPLIER = FEE_RATE_MULTIPLIER;
-function getSupportedSwapChains() {
-  return [...new Set(Object.values(_PROVIDER_TO_SUPPORTED_PAIR_MAP).flat())];
-}
 function getSwapAlternativeAsset(swapPair) {
   var _swapPair$metadata;
   return swapPair === null || swapPair === void 0 ? void 0 : (_swapPair$metadata = swapPair.metadata) === null || _swapPair$metadata === void 0 ? void 0 : _swapPair$metadata.alternativeAsset;
@@ -89,116 +49,9 @@ function getSwapAltToken(chainAsset) {
   var _chainAsset$metadata;
   return (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.alternativeSwapAsset;
 }
-function calculateSwapRate(fromAmount, toAmount, fromAsset, toAsset) {
-  const bnFromAmount = (0, _bignumber.default)(fromAmount);
-  const bnToAmount = (0, _bignumber.default)(toAmount);
-  const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
-  const bnRate = bnFromAmount.div(bnToAmount);
-  return 1 / bnRate.times(10 ** decimalDiff).toNumber();
-}
-function convertSwapRate(rate, fromAsset, toAsset) {
-  const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
-  const bnRate = (0, _bignumber.default)(rate);
-  return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
-}
-
-// 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';
-//   }
-// }
-
-function getBridgeStep(from, to) {
-  return {
-    action: _types2.DynamicSwapType.BRIDGE,
-    pair: {
-      slug: `${from}___${to}`,
-      // todo: recheck with assetRef format from chain list
-      from,
-      to
-    }
-  };
-}
-function getSwapStep(from, to) {
-  return {
-    action: _types2.DynamicSwapType.SWAP,
-    pair: {
-      slug: `${from}___${to}`,
-      // todo: recheck with assetRef format from chain list
-      from,
-      to
-    }
-  };
-}
-function findBridgeTransitDestination(assetRefMap, fromToken, toToken) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.destChain === (0, _utils._getAssetOriginChain)(toToken) && assetRef.path === _types._AssetRefPath.XCM);
-  if (foundAssetRef) {
-    return foundAssetRef.destAsset;
-  }
-  return undefined;
-}
-function findSwapTransitDestination(assetRefMap, fromToken, toToken) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.destAsset === toToken.slug && assetRef.srcChain === (0, _utils._getAssetOriginChain)(fromToken) && assetRef.path === _types._AssetRefPath.XCM);
-  if (foundAssetRef) {
-    return foundAssetRef.srcAsset;
-  }
-  return undefined;
-}
-function findAllBridgeDestinations(assetRefMap, fromToken) {
-  const foundAssetRefs = Object.values(assetRefMap).filter(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.path === _types._AssetRefPath.XCM);
-  return foundAssetRefs.map(assetRef => assetRef.destAsset);
-}
 function getAmountAfterSlippage(amount, slippage) {
   return (0, _bignumber.default)(amount).multipliedBy((0, _bignumber.default)(1).minus((0, _bignumber.default)(slippage))).integerValue(_bignumber.default.ROUND_DOWN).toString();
 }
-function isChainsHasSameProvider(fromChain, toChain) {
-  // todo: a provider may support multiple chains but not cross-chain swaps
-  for (const group of Object.values(_PROVIDER_TO_SUPPORTED_PAIR_MAP)) {
-    if (group.includes(fromChain) && group.includes(toChain)) {
-      return true;
-    }
-  }
-  return false;
-}
 function getLastAmountFromSteps(steps) {
   var _lastStep$metadata;
   const lastStep = steps[steps.length - 1]; // last step
@@ -213,7 +66,7 @@ function getFirstAmountFromSteps(steps) {
 }
 function getChainRouteFromSteps(steps) {
   // todo: handle metadata for other providers than hydra & pah. Also add validate metadata.
-  const mainSteps = steps.filter(step => step.type !== _types2.CommonStepType.DEFAULT);
+  const mainSteps = steps.filter(step => step.type !== _types.CommonStepType.DEFAULT);
   return mainSteps.reduce((chainRoute, currentStep, currentIndex) => {
     const metadata = currentStep.metadata;
     if (!metadata) {
@@ -233,13 +86,13 @@ function getChainRouteFromSteps(steps) {
 // note: this function may return undefined if metadata version is < 2 or does not exist
 function getTokenPairFromStep(steps) {
   // todo: review this
-  const mainSteps = steps.filter(step => step.type !== _types2.CommonStepType.DEFAULT && step.type !== _types2.CommonStepType.TOKEN_APPROVAL && step.type !== _types2.SwapStepType.PERMIT);
+  const mainSteps = steps.filter(step => step.type !== _types.CommonStepType.DEFAULT && step.type !== _types.CommonStepType.TOKEN_APPROVAL && step.type !== _types.SwapStepType.PERMIT);
   if (!mainSteps.length) {
     return undefined;
   }
   const isStepValidIfSwap = step => {
     const metadata = step.metadata;
-    return step.type !== _types2.SwapStepType.SWAP || !!(metadata !== null && metadata !== void 0 && metadata.version) && (metadata === null || metadata === void 0 ? void 0 : metadata.version) >= 2;
+    return step.type !== _types.SwapStepType.SWAP || !!(metadata !== null && metadata !== void 0 && metadata.version) && (metadata === null || metadata === void 0 ? void 0 : metadata.version) >= 2;
   };
   if (mainSteps.length === 1) {
     if (!isStepValidIfSwap(mainSteps[0])) {
@@ -288,14 +141,20 @@ function getSwapChainsFromPath(path) {
 function processStepsToPathActions(steps) {
   const path = [];
   for (const step of steps) {
-    if (step.type === _types2.CommonStepType.XCM) {
-      path.push(_types2.DynamicSwapType.BRIDGE);
+    if (step.type === _types.CommonStepType.XCM) {
+      path.push(_types.DynamicSwapType.BRIDGE);
     }
-    if (step.type === _types2.SwapStepType.SWAP) {
-      path.push(_types2.DynamicSwapType.SWAP);
+    if (step.type === _types.SwapStepType.SWAP) {
+      path.push(_types.DynamicSwapType.SWAP);
     }
   }
   return path;
 }
 const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04; // add 2%
-exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = DEFAULT_EXCESS_AMOUNT_WEIGHT;
+exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = DEFAULT_EXCESS_AMOUNT_WEIGHT;
+const DetectedGenOptimalProcessErrMsg = {
+  AMOUNT_TOO_LOW: 'amount too low',
+  AMOUNT_TOO_HIGH: 'amount too high',
+  NOT_ENOUGHT_BITCOIN: 'for the transaction. lower your btc amount and try again' // todo: improve handle msg error
+};
+exports.DetectedGenOptimalProcessErrMsg = DetectedGenOptimalProcessErrMsg;

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

@@ -36,7 +36,8 @@ const isCardanoTransaction = tx => {
 // TODO: [Review] this function
 exports.isCardanoTransaction = isCardanoTransaction;
 const isBitcoinTransaction = tx => {
-  return 'data' in tx && Array.isArray(tx.data.inputs);
+  var _data;
+  return 'data' in tx && Array.isArray((_data = tx.data) === null || _data === void 0 ? void 0 : _data.inputs);
 };
 exports.isBitcoinTransaction = isBitcoinTransaction;
 const typeName = type => {

package/cjs/types/service-base.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.MOCK_STEP_FEE = exports.DEFAULT_FIRST_STEP = exports.CommonStepType = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
-/* ServiceWithProcess */
 let CommonStepType;
 exports.CommonStepType = CommonStepType;
 (function (CommonStepType) {

package/cjs/types/swap/index.js

@@ -23,13 +23,13 @@ exports.SwapErrorType = SwapErrorType;
   SwapErrorType["AMOUNT_CANNOT_BE_ZERO"] = "AMOUNT_CANNOT_BE_ZERO";
   SwapErrorType["NOT_MEET_MIN_EXPECTED"] = "NOT_MEET_MIN_EXPECTED";
 })(SwapErrorType || (exports.SwapErrorType = SwapErrorType = {}));
-let SwapStepType;
+let SwapStepType; // todo: export this to use from sdk
 exports.SwapStepType = SwapStepType;
 (function (SwapStepType) {
   SwapStepType["SWAP"] = "SWAP";
   SwapStepType["PERMIT"] = "PERMIT";
 })(SwapStepType || (exports.SwapStepType = SwapStepType = {}));
-let SwapProviderId;
+let SwapProviderId; // todo: export this to use from sdk
 exports.SwapProviderId = SwapProviderId;
 (function (SwapProviderId) {
   SwapProviderId["CHAIN_FLIP_TESTNET"] = "CHAIN_FLIP_TESTNET";
@@ -43,13 +43,10 @@ exports.SwapProviderId = SwapProviderId;
   SwapProviderId["SIMPLE_SWAP"] = "SIMPLE_SWAP";
   SwapProviderId["UNISWAP"] = "UNISWAP";
   SwapProviderId["KYBER"] = "KYBER";
+  SwapProviderId["OPTIMEX"] = "OPTIMEX";
+  SwapProviderId["OPTIMEX_TESTNET"] = "OPTIMEX_TESTNET";
 })(SwapProviderId || (exports.SwapProviderId = SwapProviderId = {}));
-const _SUPPORTED_SWAP_PROVIDERS = [SwapProviderId.CHAIN_FLIP_TESTNET, SwapProviderId.CHAIN_FLIP_MAINNET, SwapProviderId.HYDRADX_MAINNET,
-// SwapProviderId.HYDRADX_TESTNET,
-SwapProviderId.POLKADOT_ASSET_HUB, SwapProviderId.KUSAMA_ASSET_HUB,
-// SwapProviderId.ROCOCO_ASSET_HUB,
-// SwapProviderId.WESTEND_ASSET_HUB,
-SwapProviderId.SIMPLE_SWAP, SwapProviderId.UNISWAP, SwapProviderId.KYBER];
+const _SUPPORTED_SWAP_PROVIDERS = [SwapProviderId.CHAIN_FLIP_TESTNET, SwapProviderId.CHAIN_FLIP_MAINNET, SwapProviderId.HYDRADX_MAINNET, SwapProviderId.POLKADOT_ASSET_HUB, SwapProviderId.KUSAMA_ASSET_HUB, SwapProviderId.SIMPLE_SWAP, SwapProviderId.UNISWAP, SwapProviderId.KYBER, SwapProviderId.OPTIMEX, SwapProviderId.OPTIMEX_TESTNET];
 exports._SUPPORTED_SWAP_PROVIDERS = _SUPPORTED_SWAP_PROVIDERS;
 // process handling
 let SwapFeeType;

package/cjs/utils/account/common.js

@@ -56,8 +56,7 @@ function reformatAddress(address) {
   }
 }
 const _reformatAddressWithChain = (address, chainInfo) => {
-  // todo: check for cardano
-  const chainType = (0, _utils._chainInfoToChainType)(chainInfo);
+  const chainType = (0, _utils._chainInfoToAccountChainType)(chainInfo);
   if (chainType === _types.AccountChainType.SUBSTRATE) {
     return reformatAddress(address, (0, _utils._getChainSubstrateAddressPrefix)(chainInfo));
   } else if (chainType === _types.AccountChainType.TON || chainType === _types.AccountChainType.CARDANO) {