@subwallet/extension-base 1.2.3-0 → 1.2.4-0

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

@@ -11,11 +11,12 @@ 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 _swap = require("@subwallet/extension-base/core/logic-validation/swap");
 var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 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 _swap = require("@subwallet/extension-base/types/swap");
+var _swap2 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -33,9 +34,10 @@ class HydradxHandler {
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       balanceService,
       chainService,
-      providerName: isTestnet ? 'HydraDX Testnet' : 'HydraDX',
-      providerSlug: isTestnet ? _swap.SwapProviderId.HYDRADX_TESTNET : _swap.SwapProviderId.HYDRADX_MAINNET
+      providerName: isTestnet ? 'Hydration Testnet' : 'Hydration',
+      providerSlug: isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET
     });
+    this.providerSlug = isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET;
     this.isTestnet = isTestnet;
   }
   async init() {
@@ -75,7 +77,7 @@ class HydradxHandler {
   async getXcmStep(params) {
     const bnAmount = new _bignumber.default(params.request.fromAmount);
     const fromAsset = this.chainService.getAssetBySlug(params.request.pair.from);
-    const fromAssetBalance = await this.balanceService.getTokenFreeBalance(params.request.address, fromAsset.originChain, fromAsset.slug);
+    const fromAssetBalance = await this.balanceService.getTransferableBalance(params.request.address, fromAsset.originChain, fromAsset.slug);
     const bnFromAssetBalance = new _bignumber.default(fromAssetBalance.value);
     if (bnFromAssetBalance.gte(bnAmount)) {
       return undefined; // enough balance, no need to xcm
@@ -86,7 +88,7 @@ class HydradxHandler {
       return undefined;
     }
     const alternativeAsset = this.chainService.getAssetBySlug(alternativeAssetSlug);
-    const alternativeAssetBalance = await this.balanceService.getTokenFreeBalance(params.request.address, alternativeAsset.originChain, alternativeAsset.slug);
+    const alternativeAssetBalance = await this.balanceService.getTransferableBalance(params.request.address, alternativeAsset.originChain, alternativeAsset.slug);
     const bnAlternativeAssetBalance = new _bignumber.default(alternativeAssetBalance.value);
     if (bnAlternativeAssetBalance.lte(0)) {
       return undefined;
@@ -100,7 +102,7 @@ class HydradxHandler {
           destinationTokenInfo: fromAsset
         },
         name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
-        type: _swap.SwapStepType.XCM
+        type: _swap2.SwapStepType.XCM
       };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
       const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
@@ -115,7 +117,7 @@ class HydradxHandler {
       const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
       const fee = {
         feeComponent: [{
-          feeType: _swap.SwapFeeType.NETWORK_FEE,
+          feeType: _swap2.SwapFeeType.NETWORK_FEE,
           amount: Math.round(xcmFeeInfo.partialFee * 1.2).toString(),
           tokenSlug: (0, _utils._getChainNativeTokenSlug)(alternativeChainInfo)
         }],
@@ -137,7 +139,7 @@ class HydradxHandler {
     }
     const feeStep = {
       name: 'Set fee token',
-      type: _swap.SwapStepType.SET_FEE_TOKEN
+      type: _swap2.SwapStepType.SET_FEE_TOKEN
     };
     try {
       const substrateApi = this.chainService.getSubstrateApi(this.chain());
@@ -154,7 +156,7 @@ class HydradxHandler {
       const txFee = _txFee.toPrimitive();
       const fee = {
         feeComponent: [{
-          feeType: _swap.SwapFeeType.NETWORK_FEE,
+          feeType: _swap2.SwapFeeType.NETWORK_FEE,
           amount: Math.round(txFee.partialFee).toString(),
           tokenSlug: selectedFeeAsset.slug
         }],
@@ -171,7 +173,7 @@ class HydradxHandler {
     if (params.selectedQuote) {
       const submitStep = {
         name: 'Swap',
-        type: _swap.SwapStepType.SWAP
+        type: _swap2.SwapStepType.SWAP
       };
       return Promise.resolve([submitStep, params.selectedQuote.feeInfo]);
     }
@@ -217,12 +219,12 @@ class HydradxHandler {
     const fromChain = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const fromChainNativeTokenSlug = (0, _utils._getChainNativeTokenSlug)(fromChain);
     if (!this.isReady || !this.tradeRouter) {
-      return new _SwapError.SwapError(_swap.SwapErrorType.UNKNOWN);
+      return new _SwapError.SwapError(_swap2.SwapErrorType.UNKNOWN);
     }
     const earlyValidation = await this.validateSwapRequest(request);
     if (earlyValidation.error) {
       const metadata = earlyValidation.metadata;
-      return (0, _utils2.getEarlyHydradxValidationError)(earlyValidation.error, metadata);
+      return (0, _swap._getEarlyHydradxValidationError)(earlyValidation.error, metadata);
     }
     try {
       const fromAssetId = (0, _utils._getTokenOnChainAssetId)(fromAsset);
@@ -238,13 +240,13 @@ class HydradxHandler {
       const networkFee = {
         tokenSlug: fromChainNativeTokenSlug,
         amount: paymentInfo.partialFee.toString(),
-        feeType: _swap.SwapFeeType.NETWORK_FEE
+        feeType: _swap2.SwapFeeType.NETWORK_FEE
       };
       const tradeFee = {
         tokenSlug: toAsset.slug,
         // fee is subtracted from receiving amount
         amount: quoteResponse.tradeFee.toString(),
-        feeType: _swap.SwapFeeType.PLATFORM_FEE
+        feeType: _swap2.SwapFeeType.PLATFORM_FEE
       };
       const swapRoute = this.parseSwapPath(quoteResponse.swaps);
       const swapPathErrors = this.getSwapPathErrors(quoteResponse.swaps);
@@ -253,15 +255,15 @@ class HydradxHandler {
 
         switch (defaultError) {
           case _sdk.PoolError.InsufficientTradingAmount:
-            return new _SwapError.SwapError(_swap.SwapErrorType.SWAP_NOT_ENOUGH_BALANCE);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.SWAP_NOT_ENOUGH_BALANCE);
           case _sdk.PoolError.TradeNotAllowed:
-            return new _SwapError.SwapError(_swap.SwapErrorType.ERROR_FETCHING_QUOTE);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
           case _sdk.PoolError.MaxInRatioExceeded:
-            return new _SwapError.SwapError(_swap.SwapErrorType.NOT_ENOUGH_LIQUIDITY);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.NOT_ENOUGH_LIQUIDITY);
           case _sdk.PoolError.UnknownError:
-            return new _SwapError.SwapError(_swap.SwapErrorType.ERROR_FETCHING_QUOTE);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
           case _sdk.PoolError.MaxOutRatioExceeded:
-            return new _SwapError.SwapError(_swap.SwapErrorType.NOT_ENOUGH_LIQUIDITY);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.NOT_ENOUGH_LIQUIDITY);
         }
       }
 
@@ -293,7 +295,7 @@ class HydradxHandler {
         metadata: txHex
       };
     } catch (e) {
-      return new _SwapError.SwapError(_swap.SwapErrorType.ERROR_FETCHING_QUOTE);
+      return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
     }
   }
   async handleXcmStep(params) {
@@ -303,7 +305,7 @@ class HydradxHandler {
     const destinationAsset = this.chainService.getAssetBySlug(pair.from);
     const substrateApi = this.chainService.getSubstrateApi(originAsset.originChain);
     const chainApi = await substrateApi.isReady;
-    const destinationAssetBalance = await this.balanceService.getTokenFreeBalance(params.address, destinationAsset.originChain, destinationAsset.slug);
+    const destinationAssetBalance = await this.balanceService.getTransferableBalance(params.address, destinationAsset.originChain, destinationAsset.slug);
     const xcmFee = params.process.totalFee[params.currentStep];
     const bnAmount = new _bignumber.default(params.quote.fromAmount);
     const bnDestinationAssetBalance = new _bignumber.default(destinationAssetBalance.value);
@@ -343,7 +345,7 @@ class HydradxHandler {
     var _swapFeeInfo$selected;
     const substrateApi = this.chainService.getSubstrateApi(this.chain());
     const chainApi = await substrateApi.isReady;
-    const swapStepIndex = params.process.steps.findIndex(step => step.type === _swap.SwapStepType.SWAP);
+    const swapStepIndex = params.process.steps.findIndex(step => step.type === _swap2.SwapStepType.SWAP);
     if (swapStepIndex <= -1) {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
     }
@@ -383,7 +385,7 @@ class HydradxHandler {
     const referral = _referral === null || _referral === void 0 ? void 0 : _referral.toString();
     const needSetReferral = !referral || referral === '';
     const steps = params.process.steps.map(step => step.type);
-    const needSetFeeToken = steps.includes(_swap.SwapStepType.SET_FEE_TOKEN);
+    const needSetFeeToken = steps.includes(_swap2.SwapStepType.SET_FEE_TOKEN);
     if (!needSetReferral && !needSetFeeToken) {
       extrinsic = swapTx;
     } else {
@@ -414,13 +416,13 @@ class HydradxHandler {
     } = params;
     const type = process.steps[currentStep].type;
     switch (type) {
-      case _swap.SwapStepType.DEFAULT:
+      case _swap2.SwapStepType.DEFAULT:
         return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
-      case _swap.SwapStepType.XCM:
+      case _swap2.SwapStepType.XCM:
         return this.handleXcmStep(params);
-      case _swap.SwapStepType.SET_FEE_TOKEN:
+      case _swap2.SwapStepType.SET_FEE_TOKEN:
         return this.handleSetFeeStep(params);
-      case _swap.SwapStepType.SWAP:
+      case _swap2.SwapStepType.SWAP:
         return this.handleSubmitStep(params);
       default:
         return this.handleSubmitStep(params);
@@ -436,11 +438,11 @@ class HydradxHandler {
     for (const [index, step] of params.process.steps.entries()) {
       const getErrors = async () => {
         switch (step.type) {
-          case _swap.SwapStepType.DEFAULT:
+          case _swap2.SwapStepType.DEFAULT:
             return Promise.resolve([]);
-          case _swap.SwapStepType.XCM:
+          case _swap2.SwapStepType.XCM:
             return this.swapBaseHandler.validateXcmStep(params, index);
-          case _swap.SwapStepType.SET_FEE_TOKEN:
+          case _swap2.SwapStepType.SET_FEE_TOKEN:
             return this.swapBaseHandler.validateSetFeeTokenStep(params, index);
           default:
             return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
@@ -449,7 +451,7 @@ class HydradxHandler {
       const errors = await getErrors();
       if (errors.length) {
         return errors;
-      } else if (step.type === _swap.SwapStepType.XCM) {
+      } else if (step.type === _swap2.SwapStepType.XCM) {
         isXcmOk = true;
       }
     }
@@ -466,42 +468,42 @@ class HydradxHandler {
       const allAssets = await ((_this$tradeRouter = this.tradeRouter) === null || _this$tradeRouter === void 0 ? void 0 : _this$tradeRouter.getAllAssets());
       if (!allAssets) {
         return {
-          error: _swap.SwapErrorType.UNKNOWN
+          error: _swap2.SwapErrorType.UNKNOWN
         };
       }
       const supportedFromAsset = allAssets.find(asset => asset.id === fromAssetId && asset.symbol === fromAsset.symbol);
       const supportedToAsset = allAssets.find(asset => asset.id === toAssetId && asset.symbol === toAsset.symbol);
       if (!supportedFromAsset || !supportedToAsset) {
         return {
-          error: _swap.SwapErrorType.ASSET_NOT_SUPPORTED
+          error: _swap2.SwapErrorType.ASSET_NOT_SUPPORTED
         };
       }
       const assetPairs = await ((_this$tradeRouter2 = this.tradeRouter) === null || _this$tradeRouter2 === void 0 ? void 0 : _this$tradeRouter2.getAssetPairs(fromAssetId));
       if (!assetPairs) {
         return {
-          error: _swap.SwapErrorType.UNKNOWN
+          error: _swap2.SwapErrorType.UNKNOWN
         };
       }
       const pairedToAsset = assetPairs.find(supportedToAsset => supportedToAsset.id === toAssetId && supportedToAsset.symbol === toAsset.symbol);
       if (!pairedToAsset) {
         return {
-          error: _swap.SwapErrorType.ASSET_NOT_SUPPORTED
+          error: _swap2.SwapErrorType.ASSET_NOT_SUPPORTED
         };
       }
       if (!(fromAsset.originChain === this.chain() && toAsset.originChain === this.chain())) {
         return {
-          error: _swap.SwapErrorType.ASSET_NOT_SUPPORTED
+          error: _swap2.SwapErrorType.ASSET_NOT_SUPPORTED
         };
       }
       if (!fromAssetId || !toAssetId) {
         return {
-          error: _swap.SwapErrorType.UNKNOWN
+          error: _swap2.SwapErrorType.UNKNOWN
         };
       }
       const bnAmount = new _bignumber.default(request.fromAmount);
       if (bnAmount.lte(0)) {
         return {
-          error: _swap.SwapErrorType.AMOUNT_CANNOT_BE_ZERO
+          error: _swap2.SwapErrorType.AMOUNT_CANNOT_BE_ZERO
         };
       }
       return {
@@ -511,7 +513,7 @@ class HydradxHandler {
       };
     } catch (e) {
       return {
-        error: _swap.SwapErrorType.UNKNOWN
+        error: _swap2.SwapErrorType.UNKNOWN
       };
     }
   }

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

@@ -30,12 +30,18 @@ class SwapService {
   }
   async askProvidersForQuote(request) {
     const availableQuotes = [];
+    const swappingSrcChain = this.chainService.getAssetBySlug(request.pair.from).originChain;
     await Promise.all(Object.values(this.handlers).map(async handler => {
+      // temporary solution to reduce number of requests to providers, will work as long as there's only 1 provider for 1 chain
+      if (!_utils._PROVIDER_TO_SUPPORTED_PAIR_MAP[handler.providerSlug].includes(swappingSrcChain)) {
+        return;
+      }
       if (handler.init && handler.isReady === false) {
         await handler.init();
       }
       const quote = await handler.getSwapQuote(request);
       if (!(quote instanceof _SwapError.SwapError)) {
+        // todo: can do better
         availableQuotes.push({
           quote
         });

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

@@ -4,18 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SWAP_QUOTE_TIMEOUT_MAP = exports.MOCK_SWAP_FEE = exports.DEFAULT_SWAP_FIRST_STEP = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
+exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.MOCK_SWAP_FEE = exports.DEFAULT_SWAP_FIRST_STEP = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.calculateSwapRate = calculateSwapRate;
-exports.getChainflipEarlyValidationError = getChainflipEarlyValidationError;
-exports.getEarlyHydradxValidationError = getEarlyHydradxValidationError;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
 var _swap = require("@chainflip/sdk/swap");
 var _chainList = require("@subwallet/chain-list");
-var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _swap2 = require("@subwallet/extension-base/types/swap");
-var _utils2 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -65,6 +61,13 @@ const MOCK_SWAP_FEE = {
   feeOptions: []
 };
 exports.MOCK_SWAP_FEE = MOCK_SWAP_FEE;
+const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
+  [_swap2.SwapProviderId.HYDRADX_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX],
+  [_swap2.SwapProviderId.HYDRADX_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
+  [_swap2.SwapProviderId.CHAIN_FLIP_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM],
+  [_swap2.SwapProviderId.CHAIN_FLIP_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA]
+};
+exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = _PROVIDER_TO_SUPPORTED_PAIR_MAP;
 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;
@@ -79,48 +82,4 @@ function calculateSwapRate(fromAmount, toAmount, fromAsset, toAsset) {
   const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
   const bnRate = bnFromAmount.div(bnToAmount);
   return 1 / bnRate.times(10 ** decimalDiff).toNumber();
-}
-function getChainflipEarlyValidationError(error, metadata) {
-  // todo: support more providers
-  switch (error) {
-    case _swap2.SwapErrorType.NOT_MEET_MIN_SWAP:
-      {
-        const parsedMinSwapValue = (0, _utils2.formatNumber)(metadata.minSwap.value, metadata.minSwap.decimals);
-        const message = `Amount too low. Increase your amount above ${parsedMinSwapValue} ${metadata.minSwap.symbol} and try again`;
-        return new _SwapError.SwapError(error, message);
-      }
-    case _swap2.SwapErrorType.SWAP_EXCEED_ALLOWANCE:
-      {
-        if (metadata.maxSwap) {
-          const parsedMaxSwapValue = (0, _utils2.formatNumber)(metadata.maxSwap.value, metadata.maxSwap.decimals);
-          return new _SwapError.SwapError(error, `Amount too high. Lower your amount below ${parsedMaxSwapValue} ${metadata.maxSwap.symbol} and try again`);
-        } else {
-          return new _SwapError.SwapError(error, 'Amount too high. Lower your amount and try again');
-        }
-      }
-    case _swap2.SwapErrorType.ASSET_NOT_SUPPORTED:
-      return new _SwapError.SwapError(error, 'This swap pair is not supported');
-    case _swap2.SwapErrorType.UNKNOWN:
-      return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
-    case _swap2.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
-    default:
-      return new _SwapError.SwapError(error);
-  }
-}
-function getEarlyHydradxValidationError(error, metadata) {
-  switch (error) {
-    case _swap2.SwapErrorType.AMOUNT_CANNOT_BE_ZERO:
-      {
-        return new _SwapError.SwapError(error, 'Amount too low. Increase your amount above 0 and try again');
-      }
-    case _swap2.SwapErrorType.ASSET_NOT_SUPPORTED:
-      return new _SwapError.SwapError(error, 'This swap pair is not supported');
-    case _swap2.SwapErrorType.UNKNOWN:
-      return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
-    case _swap2.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
-    default:
-      return new _SwapError.SwapError(error);
-  }
 }