@subwallet/extension-base 1.3.29-0 → 1.3.30-0

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

@@ -12,7 +12,6 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
-var _interface = require("@subwallet/extension-base/services/swap-service/interface");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
@@ -61,33 +60,6 @@ class ChainflipSwapHandler {
       return INTERMEDIARY_MAINNET_ASSET_SLUG;
     }
   }
-  async validateSwapProcess(params) {
-    const amount = params.selectedQuote.fromAmount;
-    const bnAmount = new _bignumber.default(amount);
-    if (bnAmount.lte(0)) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
-    }
-    let isXcmOk = false;
-    for (const [index, step] of params.process.steps.entries()) {
-      const getErrors = async () => {
-        switch (step.type) {
-          case _types.CommonStepType.DEFAULT:
-            return Promise.resolve([]);
-          case _types.CommonStepType.TOKEN_APPROVAL:
-            return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
-          default:
-            return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
-        }
-      };
-      const errors = await getErrors();
-      if (errors.length) {
-        return errors;
-      } else if (step.type === _types.CommonStepType.XCM) {
-        isXcmOk = true;
-      }
-    }
-    return [];
-  }
   async handleSubmitStep(params) {
     const {
       address,
@@ -106,7 +78,7 @@ class ChainflipSwapHandler {
     const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
     const processMetadata = params.process.steps[params.currentStep].metadata;
-    const quoteMetadata = params.quote.metadata;
+    const quoteMetadata = processMetadata;
     if (!processMetadata || !quoteMetadata) {
       throw new Error('Metadata for Chainflip not found');
     }
@@ -214,7 +186,7 @@ class ChainflipSwapHandler {
         return this.handleSubmitStep(params);
     }
   }
-  async getSubmitStep(params) {
+  async getSubmitStep(params, stepIndex) {
     var _params$selectedQuote;
     const metadata = (_params$selectedQuote = params.selectedQuote) === null || _params$selectedQuote === void 0 ? void 0 : _params$selectedQuote.metadata;
     if (!params.selectedQuote) {
@@ -223,22 +195,28 @@ class ChainflipSwapHandler {
     if (!metadata || !metadata.srcChain || !metadata.destChain) {
       return Promise.resolve(undefined);
     }
+    const originTokenInfo = this.chainService.getAssetBySlug(params.selectedQuote.pair.from);
+    const destinationTokenInfo = this.chainService.getAssetBySlug(params.selectedQuote.pair.to);
+    const originChain = this.chainService.getChainInfoByKey(originTokenInfo.originChain);
+    const destinationChain = this.chainService.getChainInfoByKey(destinationTokenInfo.originChain);
     const submitStep = {
       name: 'Swap',
       type: _types.SwapStepType.SWAP,
+      // @ts-ignore
       metadata: {
         sendingValue: params.request.fromAmount.toString(),
-        originTokenInfo: this.chainService.getAssetBySlug(params.selectedQuote.pair.from),
-        destinationTokenInfo: this.chainService.getAssetBySlug(params.selectedQuote.pair.to),
+        expectedReceive: params.selectedQuote.toAmount,
+        originTokenInfo,
+        destinationTokenInfo,
+        sender: (0, _utils3._reformatAddressWithChain)(params.request.address, originChain),
+        receiver: (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
-        destChain: metadata.destChain
+        destChain: metadata.destChain,
+        version: 2
       }
     };
     return Promise.resolve([submitStep, params.selectedQuote.feeInfo]);
   }
-  generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
-  }
   generateOptimalProcessV2(params) {
     return this.swapBaseHandler.generateOptimalProcessV2(params, [this.getSubmitStep.bind(this)]);
   }
@@ -255,10 +233,10 @@ class ChainflipSwapHandler {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     const actionList = JSON.stringify(process.path.map(step => step.action));
-    const swap = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP]);
-    const swapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
-    const xcmSwap = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP]);
-    const xcmSwapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
+    const swap = actionList === JSON.stringify([_types.DynamicSwapType.SWAP]);
+    const swapXcm = actionList === JSON.stringify([_types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
+    const xcmSwap = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP]);
+    const xcmSwapXcm = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
     const swapIndex = params.process.steps.findIndex(step => step.type === _types.SwapStepType.SWAP); // todo
 
     if (swapIndex <= -1) {

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

@@ -5,21 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HydradxHandler = void 0;
-var _sdk = require("@galacticcouncil/sdk");
 var _chainList = require("@subwallet/chain-list");
 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 _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
-var _interface = require("@subwallet/extension-base/services/swap-service/interface");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
-var _getId = require("@subwallet/extension-base/utils/getId");
+var _utils3 = require("@subwallet/extension-base/utils");
+var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -49,10 +46,6 @@ class HydradxHandler {
     if (!chainState.active) {
       await this.chainService.enableChain(this.chain());
     }
-    const substrateApi = this.chainService.getSubstrateApi(this.chain());
-    await substrateApi.api.isReady;
-    const poolService = new _sdk.PoolService(substrateApi.api);
-    this.tradeRouter = new _sdk.TradeRouter(poolService);
     this.isReady = true;
   }
   chain = () => {
@@ -78,75 +71,6 @@ class HydradxHandler {
   get slug() {
     return this.swapBaseHandler.slug;
   }
-  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.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
-    }
-
-    const alternativeAssetSlug = (0, _utils2.getSwapAlternativeAsset)(params.request.pair);
-    if (!alternativeAssetSlug) {
-      return undefined;
-    }
-    const alternativeAsset = this.chainService.getAssetBySlug(alternativeAssetSlug);
-    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;
-    }
-    try {
-      const alternativeChainInfo = this.chainService.getChainInfoByKey(alternativeAsset.originChain);
-      const destChainInfo = this.chainService.getChainInfoByKey(this.chain());
-      const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
-      const id = (0, _getId.getId)();
-      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, alternativeAsset.originChain, 'substrate');
-      const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
-        originTokenInfo: alternativeAsset,
-        destinationTokenInfo: fromAsset,
-        // Mock sending value to get payment info
-        sendingValue: bnAmount.toString(),
-        recipient: params.request.address,
-        substrateApi: xcmOriginSubstrateApi,
-        sender: params.request.address,
-        destinationChain: destChainInfo,
-        originChain: alternativeChainInfo,
-        feeInfo
-      });
-      const _xcmFeeInfo = await xcmTransfer.paymentInfo(params.request.address);
-      const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
-      const fee = {
-        feeComponent: [{
-          feeType: _swap.SwapFeeType.NETWORK_FEE,
-          amount: Math.round(xcmFeeInfo.partialFee * _constants.XCM_MIN_AMOUNT_RATIO).toString(),
-          tokenSlug: (0, _utils._getChainNativeTokenSlug)(alternativeChainInfo)
-        }],
-        defaultFeeToken: (0, _utils._getChainNativeTokenSlug)(alternativeChainInfo),
-        feeOptions: [(0, _utils._getChainNativeTokenSlug)(alternativeChainInfo)]
-      };
-      let bnTransferAmount = bnAmount.minus(bnFromAssetBalance);
-      if ((0, _utils._isNativeToken)(alternativeAsset)) {
-        const bnXcmFee = new _bignumber.default(fee.feeComponent[0].amount); // xcm fee is paid in native token but swap token is not always native token
-
-        bnTransferAmount = bnTransferAmount.plus(bnXcmFee);
-      }
-      const step = {
-        metadata: {
-          sendingValue: bnTransferAmount.toString(),
-          originTokenInfo: alternativeAsset,
-          destinationTokenInfo: fromAsset
-        },
-        name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
-        type: _serviceBase.CommonStepType.XCM
-      };
-      return [step, fee];
-    } catch (e) {
-      console.error('Error creating xcm step', e);
-      return undefined;
-    }
-  }
   async getFeeOptionStep(params) {
     if (!params.selectedQuote) {
       return Promise.resolve(undefined);
@@ -187,173 +111,94 @@ class HydradxHandler {
       return undefined;
     }
   }
-  async getSubmitStep(params) {
-    if (params.selectedQuote) {
-      const submitStep = {
-        name: 'Swap',
-        type: _swap.SwapStepType.SWAP
-      };
-      return Promise.resolve([submitStep, params.selectedQuote.feeInfo]);
-    }
-    return Promise.resolve(undefined);
-  }
-  async getXcmStepV2(params) {
-    var _params$path$find;
-    // todo: improve this function for Round 2
-
-    const xcmPairInfo = (_params$path$find = params.path.find((step, i) => i === 0 && step.action === _interface.DynamicSwapType.BRIDGE)) === null || _params$path$find === void 0 ? void 0 : _params$path$find.pair;
-    if (!xcmPairInfo) {
-      return undefined;
-    }
-    const fromTokenInfo = this.chainService.getAssetBySlug(xcmPairInfo.from);
-    const toTokenInfo = this.chainService.getAssetBySlug(xcmPairInfo.to);
-    const fromChainInfo = this.chainService.getChainInfoByKey(fromTokenInfo.originChain);
-    const toChainInfo = this.chainService.getChainInfoByKey(toTokenInfo.originChain);
-    if (!fromChainInfo || !toChainInfo || !fromChainInfo || !toChainInfo) {
-      throw Error('Token and chain not found');
-    }
-    try {
-      const substrateApi = await this.chainService.getSubstrateApi(fromTokenInfo.originChain).isReady;
-      const id = (0, _getId.getId)();
-      const [feeInfo, toTokenBalance] = await Promise.all([this.swapBaseHandler.feeService.subscribeChainFee(id, fromTokenInfo.originChain, 'substrate'), this.balanceService.getTotalBalance(params.request.address, toTokenInfo.originChain, toTokenInfo.slug, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE)]);
-      const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
-        originTokenInfo: fromTokenInfo,
-        destinationTokenInfo: toTokenInfo,
-        // Mock sending value to get payment info
-        sendingValue: params.request.fromAmount,
-        recipient: params.request.address,
-        substrateApi: substrateApi,
-        sender: params.request.address,
-        originChain: fromChainInfo,
-        destinationChain: toChainInfo,
-        feeInfo
-      });
-      const _xcmFeeInfo = await xcmTransfer.paymentInfo(params.request.address);
-      const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
-      const fee = {
-        feeComponent: [{
-          feeType: _swap.SwapFeeType.NETWORK_FEE,
-          amount: Math.ceil(xcmFeeInfo.partialFee * _utils2.FEE_RATE_MULTIPLIER.high).toString(),
-          tokenSlug: (0, _utils._getChainNativeTokenSlug)(fromChainInfo)
-        }],
-        defaultFeeToken: (0, _utils._getChainNativeTokenSlug)(fromChainInfo),
-        feeOptions: [(0, _utils._getChainNativeTokenSlug)(fromChainInfo)]
-      };
-      let bnTransferAmount = new _bignumber.default(params.request.fromAmount);
-
-      // todo: increase transfer amount when XCM local token
-      if ((0, _utils._isNativeToken)(fromTokenInfo)) {
-        // xcm fee is paid in native token but swap token is not always native token
-        // add amount of fee into sending value to ensure has enough token to swap
-        const bnXcmFee = new _bignumber.default(fee.feeComponent[0].amount);
-        bnTransferAmount = bnTransferAmount.plus(bnXcmFee);
-      } else {
-        bnTransferAmount = bnTransferAmount.plus((0, _bignumber.default)((0, _utils._getTokenMinAmount)(toTokenInfo)).multipliedBy(_utils2.FEE_RATE_MULTIPLIER.medium));
-      }
-      if ((0, _bignumber.default)(toTokenBalance.value).lte(0)) {
-        bnTransferAmount = bnTransferAmount.plus((0, _utils._getTokenMinAmount)(toTokenInfo));
-      }
-      const step = {
-        metadata: {
-          sendingValue: bnTransferAmount.toString(),
-          originTokenInfo: fromTokenInfo,
-          destinationTokenInfo: toTokenInfo
-        },
-        name: `Transfer ${fromTokenInfo.symbol} from ${fromChainInfo.name}`,
-        type: _serviceBase.CommonStepType.XCM
-      };
-      return [step, fee];
-    } catch (e) {
-      console.error('Error creating xcm step', e);
-      return undefined;
+  async getSubmitStep(params, stepIndex) {
+    var _params$selectedQuote;
+    const {
+      path,
+      request: {
+        fromAmount
+      },
+      selectedQuote
+    } = params;
+    const stepData = path[stepIndex];
+    if (stepData.action !== _types.DynamicSwapType.SWAP) {
+      return Promise.resolve(undefined);
     }
-  }
-  async getSwapStepV2(params) {
-    var _params$path$find2;
-    const swapPairInfo = (_params$path$find2 = params.path.find(step => step.action === _interface.DynamicSwapType.SWAP)) === null || _params$path$find2 === void 0 ? void 0 : _params$path$find2.pair;
-    if (!swapPairInfo) {
+    if (!selectedQuote) {
       return Promise.resolve(undefined);
     }
-    if (!params.selectedQuote) {
+    const swapPairInfo = stepData.pair;
+    if (!swapPairInfo || !selectedQuote) {
       return Promise.resolve(undefined);
     }
-    const txHex = params.selectedQuote.metadata;
+    const originTokenInfo = this.chainService.getAssetBySlug(swapPairInfo.from);
+    const destinationTokenInfo = this.chainService.getAssetBySlug(swapPairInfo.to);
+    const originChain = this.chainService.getChainInfoByKey(originTokenInfo.originChain);
+    const destinationChain = this.chainService.getChainInfoByKey(destinationTokenInfo.originChain);
+    const sender = (0, _utils3._reformatAddressWithChain)(params.request.address, originChain);
+    let receiver = (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain);
+    const actionList = JSON.stringify(path.map(step => step.action));
+    const xcmSwapXcm = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
+    const swapXcm = actionList === JSON.stringify([_types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
+    const needModifyData = swapXcm || xcmSwapXcm;
+    let txHex = (_params$selectedQuote = params.selectedQuote) === null || _params$selectedQuote === void 0 ? void 0 : _params$selectedQuote.metadata;
+    let bnSendingValue = (0, _bignumber.default)(fromAmount);
+    let bnExpectedReceive = (0, _bignumber.default)(selectedQuote.toAmount);
+    if (needModifyData) {
+      var _subwalletApiSdk$swap;
+      // override info if xcm-swap-xcm
+      bnSendingValue = bnSendingValue.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
+      bnExpectedReceive = bnExpectedReceive.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
+      const quotes = await ((_subwalletApiSdk$swap = _subwalletApiSdk.default.swapApi) === null || _subwalletApiSdk$swap === void 0 ? void 0 : _subwalletApiSdk$swap.fetchSwapQuoteData({
+        address: sender,
+        pair: {
+          from: swapPairInfo.from,
+          to: swapPairInfo.to,
+          slug: swapPairInfo.slug
+        },
+        fromAmount: bnSendingValue.toFixed(0, 1),
+        slippage: params.request.slippage
+      }));
+      const quoteAskResponse = quotes === null || quotes === void 0 ? void 0 : quotes.find(quote => quote.provider === this.providerSlug);
+      if (!quoteAskResponse || !quoteAskResponse.quote) {
+        return Promise.resolve(undefined);
+      }
+      const overrideQuote = quoteAskResponse.quote;
+      txHex = overrideQuote.metadata;
+      receiver = (0, _utils3._reformatAddressWithChain)(params.request.address, destinationChain);
+    }
     if (!txHex || !(0, _util.isHex)(txHex)) {
       return Promise.resolve(undefined);
     }
-    const metadata = {
-      sendingValue: params.request.fromAmount.toString(),
-      originTokenInfo: this.chainService.getAssetBySlug(swapPairInfo.from),
-      destinationTokenInfo: this.chainService.getAssetBySlug(swapPairInfo.to),
-      txHex
-    };
     const submitStep = {
       name: 'Swap',
       type: _swap.SwapStepType.SWAP,
       // @ts-ignore
-      metadata
+      metadata: {
+        sendingValue: bnSendingValue.toFixed(0, 1),
+        expectedReceive: bnExpectedReceive.toFixed(0, 1),
+        originTokenInfo,
+        destinationTokenInfo,
+        sender,
+        receiver,
+        txHex,
+        version: 2
+      }
     };
-    return Promise.resolve([submitStep, params.selectedQuote.feeInfo]); // review fee
-  }
-
-  generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this),
-    // this.getFeeOptionStep.bind(this),
-    this.getSubmitStep.bind(this)]);
+    return Promise.resolve([submitStep, selectedQuote.feeInfo]);
   }
   generateOptimalProcessV2(params) {
     const stepFuncList = params.path.map(step => {
-      if (step.action === _interface.DynamicSwapType.BRIDGE) {
-        return this.getXcmStepV2.bind(this);
+      if (step.action === _types.DynamicSwapType.SWAP) {
+        return this.getSubmitStep.bind(this);
       }
-      if (step.action === _interface.DynamicSwapType.SWAP) {
-        return this.getSwapStepV2.bind(this);
+      if (step.action === _types.DynamicSwapType.BRIDGE) {
+        return this.swapBaseHandler.getBridgeStep.bind(this.swapBaseHandler);
       }
       throw new Error(`Error generating optimal process: Action ${step.action} is not supported`);
     });
     return this.swapBaseHandler.generateOptimalProcessV2(params, stepFuncList);
   }
-  async handleXcmStep(params) {
-    const briefXcmStep = params.process.steps[params.currentStep].metadata;
-    if (!briefXcmStep || !briefXcmStep.originTokenInfo || !briefXcmStep.destinationTokenInfo || !briefXcmStep.sendingValue) {
-      throw new Error('XCM metadata error');
-    }
-    const originAsset = briefXcmStep.originTokenInfo;
-    const destinationAsset = briefXcmStep.destinationTokenInfo;
-    const originChain = this.chainService.getChainInfoByKey(originAsset.originChain);
-    const destinationChain = this.chainService.getChainInfoByKey(destinationAsset.originChain);
-    const substrateApi = this.chainService.getSubstrateApi(originAsset.originChain);
-    const chainApi = await substrateApi.isReady;
-    const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), originAsset.originChain, 'substrate');
-    const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
-      originTokenInfo: originAsset,
-      destinationTokenInfo: destinationAsset,
-      sendingValue: briefXcmStep.sendingValue,
-      recipient: params.address,
-      substrateApi: chainApi,
-      sender: params.address,
-      destinationChain,
-      originChain,
-      feeInfo
-    });
-    const xcmData = {
-      originNetworkKey: originAsset.originChain,
-      destinationNetworkKey: destinationAsset.originChain,
-      from: params.address,
-      to: params.address,
-      value: briefXcmStep.sendingValue,
-      tokenSlug: originAsset.slug,
-      showExtraWarning: true
-    };
-    return {
-      txChain: originAsset.originChain,
-      extrinsic: xcmTransfer,
-      transferNativeAmount: (0, _utils._isNativeToken)(originAsset) ? briefXcmStep.sendingValue : '0',
-      extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
-      chainType: _KoniTypes.ChainType.SUBSTRATE,
-      txData: xcmData
-    };
-  }
   async handleSetFeeStep(params) {
     var _swapFeeInfo$selected;
     const substrateApi = this.chainService.getSubstrateApi(this.chain());
@@ -380,7 +225,7 @@ class HydradxHandler {
   }
   async handleSubmitStep(params) {
     const metadata = params.process.steps[params.currentStep].metadata;
-    const txHex = params.quote.metadata;
+    const txHex = metadata.txHex;
     if (!txHex || !(0, _util.isHex)(txHex)) {
       return new _SwapError.SwapError(_swap.SwapErrorType.UNKNOWN);
     }
@@ -388,7 +233,7 @@ class HydradxHandler {
       throw new Error('Swap metadata error');
     }
     const fromAsset = metadata.originTokenInfo;
-    if (!this.isReady || !this.tradeRouter) {
+    if (!this.isReady) {
       return new _SwapError.SwapError(_swap.SwapErrorType.UNKNOWN);
     }
     const substrateApi = this.chainService.getSubstrateApi(this.chain());
@@ -441,7 +286,7 @@ class HydradxHandler {
       case _serviceBase.CommonStepType.DEFAULT:
         return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
       case _serviceBase.CommonStepType.XCM:
-        return this.handleXcmStep(params);
+        return this.swapBaseHandler.handleBridgeStep(params);
       case _serviceBase.CommonStepType.SET_FEE_TOKEN:
         return this.handleSetFeeStep(params);
       case _swap.SwapStepType.SWAP:
@@ -450,43 +295,6 @@ class HydradxHandler {
         return this.handleSubmitStep(params);
     }
   }
-  async validateSwapProcess(params) {
-    const amount = params.selectedQuote.fromAmount;
-    const bnAmount = new _bignumber.default(amount);
-    if (bnAmount.lte(0)) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
-    }
-    const swapStep = params.process.steps.find(item => item.type === _swap.SwapStepType.SWAP);
-    if (!swapStep) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, 'Swap step not found')];
-    }
-    let isXcmOk = false;
-    const currentStep = params.currentStep;
-    for (const [index, step] of params.process.steps.entries()) {
-      if (currentStep > index) {
-        continue;
-      }
-      const getErrors = async () => {
-        switch (step.type) {
-          case _serviceBase.CommonStepType.DEFAULT:
-            return Promise.resolve([]);
-          case _serviceBase.CommonStepType.XCM:
-            return this.swapBaseHandler.validateXcmStepV2(params, index);
-          case _serviceBase.CommonStepType.SET_FEE_TOKEN:
-            return this.swapBaseHandler.validateSetFeeTokenStep(params, index);
-          default:
-            return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
-        }
-      };
-      const errors = await getErrors();
-      if (errors.length) {
-        return errors;
-      } else if (step.type === _serviceBase.CommonStepType.XCM) {
-        isXcmOk = true;
-      }
-    }
-    return [];
-  }
   async validateSwapProcessV2(params) {
     // todo: recheck address and recipient format in params
     const {
@@ -500,22 +308,22 @@ class HydradxHandler {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     const actionList = JSON.stringify(process.path.map(step => step.action));
-    const swap = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP]);
-    const swapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
-    const xcmSwap = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP]);
-    const xcmSwapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
+    const swap = actionList === JSON.stringify([_types.DynamicSwapType.SWAP]);
+    const swapXcm = actionList === JSON.stringify([_types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
+    const xcmSwap = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP]);
+    const xcmSwapXcm = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, 1); // todo: create interface for input request
     }
 
     if (swapXcm) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
+      return this.swapBaseHandler.validateSwapXcmProcess(params, 1, 2);
     }
     if (xcmSwap) {
       return this.swapBaseHandler.validateXcmSwapProcess(params, 2, 1);
     }
     if (xcmSwapXcm) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
+      return this.swapBaseHandler.validateXcmSwapXcmProcess(params, 2, 1, 3);
     }
     return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
   }

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

@@ -8,7 +8,6 @@ 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 _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _interface = require("@subwallet/extension-base/services/swap-service/interface");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
@@ -70,33 +69,6 @@ class SimpleSwapHandler {
     });
     this.providerSlug = _types.SwapProviderId.SIMPLE_SWAP;
   }
-  async validateSwapProcess(params) {
-    const amount = params.selectedQuote.fromAmount;
-    const bnAmount = BigInt(amount);
-    if (bnAmount <= BigInt(0)) {
-      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')]);
-    }
-    let isXcmOk = false;
-    for (const [index, step] of params.process.steps.entries()) {
-      const getErrors = async () => {
-        switch (step.type) {
-          case _types.CommonStepType.DEFAULT:
-            return Promise.resolve([]);
-          case _types.CommonStepType.TOKEN_APPROVAL:
-            return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
-          default:
-            return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
-        }
-      };
-      const errors = await getErrors();
-      if (errors.length) {
-        return errors;
-      } else if (step.type === _types.CommonStepType.XCM) {
-        isXcmOk = true;
-      }
-    }
-    return [];
-  }
   get chainService() {
     return this.swapBaseHandler.chainService;
   }
@@ -112,26 +84,32 @@ class SimpleSwapHandler {
   get slug() {
     return this.swapBaseHandler.slug;
   }
-  generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
-  }
   generateOptimalProcessV2(params) {
     return this.swapBaseHandler.generateOptimalProcessV2(params, [this.getSubmitStep.bind(this)]);
   }
-  async getSubmitStep(params) {
-    if (params.selectedQuote) {
-      const submitStep = {
-        name: 'Swap',
-        type: _types.SwapStepType.SWAP,
-        metadata: {
-          sendingValue: params.request.fromAmount.toString(),
-          originTokenInfo: this.chainService.getAssetBySlug(params.selectedQuote.pair.from),
-          destinationTokenInfo: this.chainService.getAssetBySlug(params.selectedQuote.pair.to)
-        }
-      };
-      return Promise.resolve([submitStep, params.selectedQuote.feeInfo]);
+  async getSubmitStep(params, stepIndex) {
+    if (!params.selectedQuote) {
+      return Promise.resolve(undefined);
     }
-    return Promise.resolve(undefined);
+    const originTokenInfo = this.chainService.getAssetBySlug(params.selectedQuote.pair.from);
+    const destinationTokenInfo = this.chainService.getAssetBySlug(params.selectedQuote.pair.to);
+    const originChain = this.chainService.getChainInfoByKey(originTokenInfo.originChain);
+    const destinationChain = this.chainService.getChainInfoByKey(destinationTokenInfo.originChain);
+    const submitStep = {
+      name: 'Swap',
+      type: _types.SwapStepType.SWAP,
+      // @ts-ignore
+      metadata: {
+        sendingValue: params.request.fromAmount.toString(),
+        expectedReceive: params.selectedQuote.toAmount,
+        originTokenInfo,
+        destinationTokenInfo,
+        sender: (0, _utils2._reformatAddressWithChain)(params.request.address, originChain),
+        receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
+        version: 2
+      }
+    };
+    return Promise.resolve([submitStep, params.selectedQuote.feeInfo]);
   }
   async handleSwapProcess(params) {
     const {
@@ -180,6 +158,7 @@ class SimpleSwapHandler {
       sender,
       toAsset
     });
+    console.log('simpleswap data', id, addressFrom);
     if (!id || id.length === 0 || !addressFrom || addressFrom.length === 0) {
       throw new _SwapError.SwapError(_types.SwapErrorType.UNKNOWN);
     }
@@ -264,10 +243,10 @@ class SimpleSwapHandler {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     const actionList = JSON.stringify(process.path.map(step => step.action));
-    const swap = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP]);
-    const swapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
-    const xcmSwap = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP]);
-    const xcmSwapXcm = actionList === JSON.stringify([_interface.DynamicSwapType.BRIDGE, _interface.DynamicSwapType.SWAP, _interface.DynamicSwapType.BRIDGE]);
+    const swap = actionList === JSON.stringify([_types.DynamicSwapType.SWAP]);
+    const swapXcm = actionList === JSON.stringify([_types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
+    const xcmSwap = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP]);
+    const xcmSwapXcm = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
     const swapIndex = params.process.steps.findIndex(step => step.type === _types.SwapStepType.SWAP); // todo
 
     if (swapIndex <= -1) {