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

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

@@ -4,16 +4,24 @@ 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.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
+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.findXcmDestination = findXcmDestination;
+exports.findAllBridgeDestinations = findAllBridgeDestinations;
+exports.findBridgeTransitDestination = findBridgeTransitDestination;
+exports.findSwapTransitDestination = findSwapTransitDestination;
+exports.getAmountAfterSlippage = getAmountAfterSlippage;
 exports.getBridgeStep = getBridgeStep;
+exports.getChainRouteFromSteps = getChainRouteFromSteps;
 exports.getChainflipBroker = getChainflipBroker;
 exports.getChainflipOptions = getChainflipOptions;
 exports.getChainflipSwap = getChainflipSwap;
+exports.getFirstAmountFromSteps = getFirstAmountFromSteps;
+exports.getLastAmountFromSteps = getLastAmountFromSteps;
+exports.getSupportSwapChain = getSupportSwapChain;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
+exports.getSwapChainsFromPath = getSwapChainsFromPath;
 exports.getSwapStep = getSwapStep;
 exports.getTokenPairFromStep = getTokenPairFromStep;
 exports.isChainsHasSameProvider = isChainsHasSameProvider;
@@ -21,7 +29,6 @@ var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
-var _interface = require("@subwallet/extension-base/services/swap-service/interface");
 var _types2 = require("@subwallet/extension-base/types");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -44,7 +51,7 @@ const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
 exports.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING;
 const SWAP_QUOTE_TIMEOUT_MAP = {
   // in milliseconds
-  default: 30000,
+  default: 90000,
   [_swap.SwapProviderId.CHAIN_FLIP_TESTNET]: 30000,
   [_swap.SwapProviderId.CHAIN_FLIP_MAINNET]: 30000
 };
@@ -69,6 +76,9 @@ const FEE_RATE_MULTIPLIER = {
   high: 2
 };
 exports.FEE_RATE_MULTIPLIER = FEE_RATE_MULTIPLIER;
+function getSupportSwapChain() {
+  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;
@@ -78,15 +88,15 @@ function getSwapAltToken(chainAsset) {
   return (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.alternativeSwapAsset;
 }
 function calculateSwapRate(fromAmount, toAmount, fromAsset, toAsset) {
-  const bnFromAmount = new _bignumber.default(fromAmount);
-  const bnToAmount = new _bignumber.default(toAmount);
+  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 = new _bignumber.default(rate);
+  const bnRate = (0, _bignumber.default)(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
 }
 function getChainflipOptions(isTestnet) {
@@ -124,9 +134,10 @@ function getChainflipSwap(isTestnet) {
 }
 function getBridgeStep(from, to) {
   return {
-    action: _interface.DynamicSwapType.BRIDGE,
+    action: _types2.DynamicSwapType.BRIDGE,
     pair: {
       slug: `${from}___${to}`,
+      // todo: recheck with assetRef format from chain list
       from,
       to
     }
@@ -134,21 +145,36 @@ function getBridgeStep(from, to) {
 }
 function getSwapStep(from, to) {
   return {
-    action: _interface.DynamicSwapType.SWAP,
+    action: _types2.DynamicSwapType.SWAP,
     pair: {
       slug: `${from}___${to}`,
+      // todo: recheck with assetRef format from chain list
       from,
       to
     }
   };
 }
-function findXcmDestination(assetRefMap, chainAsset, destChain) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.srcAsset === chainAsset.slug && assetRef.destChain === destChain && assetRef.path === _types._AssetRefPath.XCM);
+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)) {
@@ -158,27 +184,91 @@ function isChainsHasSameProvider(fromChain, toChain) {
   }
   return false;
 }
-function getTokenPairFromStep(steps) {
+function getLastAmountFromSteps(steps) {
+  var _lastStep$metadata;
+  const lastStep = steps[steps.length - 1]; // last step
+  const lastAmount = lastStep === null || lastStep === void 0 ? void 0 : (_lastStep$metadata = lastStep.metadata) === null || _lastStep$metadata === void 0 ? void 0 : _lastStep$metadata.destinationValue;
+  return lastAmount !== null && lastAmount !== void 0 ? lastAmount : undefined;
+}
+function getFirstAmountFromSteps(steps) {
+  var _firstStep$metadata;
+  const firstStep = steps[1]; // first step after default step
+  const firstAmount = firstStep === null || firstStep === void 0 ? void 0 : (_firstStep$metadata = firstStep.metadata) === null || _firstStep$metadata === void 0 ? void 0 : _firstStep$metadata.sendingValue;
+  return firstAmount !== null && firstAmount !== void 0 ? firstAmount : undefined;
+}
+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);
+  return mainSteps.reduce((chainRoute, currentStep, currentIndex) => {
+    const metadata = currentStep.metadata;
+    if (!metadata) {
+      console.error('Step has no metadata');
+      return chainRoute;
+    }
+    if (currentIndex === 0) {
+      chainRoute.push(metadata.originTokenInfo.originChain);
+      chainRoute.push(metadata.destinationTokenInfo.originChain);
+    } else {
+      chainRoute.push(metadata.destinationTokenInfo.originChain);
+    }
+    return chainRoute;
+  }, []);
+}
+
+// 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);
   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;
+  };
   if (mainSteps.length === 1) {
-    const metadata = mainSteps[0].metadata; // todo: temp for round 1, the exact interface is handle in round 2
-
+    if (!isStepValidIfSwap(mainSteps[0])) {
+      return undefined;
+    }
+    const metadata = mainSteps[0].metadata;
+    if (!metadata) {
+      return undefined;
+    }
     return {
       from: metadata.originTokenInfo.slug,
       to: metadata.destinationTokenInfo.slug,
-      slug: `${metadata.originTokenInfo.slug}___${metadata.destinationTokenInfo.slug}`
+      slug: (0, _utils._parseAssetRefKey)(metadata.originTokenInfo.slug, metadata.destinationTokenInfo.slug)
     };
   }
   const firstStep = mainSteps[0];
   const lastStep = mainSteps[mainSteps.length - 1];
+  if (!isStepValidIfSwap(firstStep) || !isStepValidIfSwap(lastStep)) {
+    return undefined;
+  }
   const firstMetadata = firstStep.metadata;
   const lastMetadata = lastStep.metadata;
+  if (!firstMetadata || !lastMetadata) {
+    return undefined;
+  }
   return {
     from: firstMetadata.originTokenInfo.slug,
     to: lastMetadata.destinationTokenInfo.slug,
-    slug: `${firstMetadata.originTokenInfo.slug}___${lastMetadata.destinationTokenInfo.slug}`
+    slug: (0, _utils._parseAssetRefKey)(firstMetadata.originTokenInfo.slug, lastMetadata.destinationTokenInfo.slug)
   };
-}
+}
+function getSwapChainsFromPath(path) {
+  const swapChains = [];
+  path.forEach(pathElement => {
+    const fromAssetOriginChain = (0, _utils._getOriginChainOfAsset)(pathElement.pair.from);
+    const toAssetOriginChain = (0, _utils._getOriginChainOfAsset)(pathElement.pair.to);
+    if (swapChains.at(-1) !== fromAssetOriginChain) {
+      swapChains.push(fromAssetOriginChain);
+    }
+    if (swapChains.at(-1) !== toAssetOriginChain) {
+      swapChains.push(toAssetOriginChain);
+    }
+  });
+  return swapChains;
+}
+const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04; // add 2%
+exports.DEFAULT_EXCESS_AMOUNT_WEIGHT = DEFAULT_EXCESS_AMOUNT_WEIGHT;

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

@@ -87,7 +87,7 @@ class TransactionService {
     const blockedConfigObjects = await (0, _constants.fetchBlockedConfigObjects)();
     const currentConfig = this.state.settingService.getEnvironmentSetting();
     const passBlockedConfigId = (0, _constants.getPassConfigId)(currentConfig, blockedConfigObjects);
-    const blockedActionsFeaturesMaps = await (0, _constants.fetchLastestBlockedActionsAndFeatures)(passBlockedConfigId);
+    const blockedActionsFeaturesMaps = await (0, _constants.fetchLatestBlockedActionsAndFeatures)(passBlockedConfigId);
     for (const blockedActionsFeaturesMap of blockedActionsFeaturesMaps) {
       const {
         blockedActionsMap,

package/cjs/types/swap/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.CHAINFLIP_SLIPPAGE = void 0;
+exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.DynamicSwapType = exports.CHAINFLIP_SLIPPAGE = exports.BridgeStepPosition = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 // core
@@ -58,6 +58,18 @@ exports.SwapFeeType = SwapFeeType;
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {}));
+let DynamicSwapType;
+exports.DynamicSwapType = DynamicSwapType;
+(function (DynamicSwapType) {
+  DynamicSwapType["SWAP"] = "SWAP";
+  DynamicSwapType["BRIDGE"] = "BRIDGE";
+})(DynamicSwapType || (exports.DynamicSwapType = DynamicSwapType = {}));
+let BridgeStepPosition;
+exports.BridgeStepPosition = BridgeStepPosition;
+(function (BridgeStepPosition) {
+  BridgeStepPosition[BridgeStepPosition["FIRST"] = 0] = "FIRST";
+  BridgeStepPosition[BridgeStepPosition["AFTER_SWAP"] = 1] = "AFTER_SWAP";
+})(BridgeStepPosition || (exports.BridgeStepPosition = BridgeStepPosition = {}));
 const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
 exports.CHAINFLIP_SLIPPAGE = CHAINFLIP_SLIPPAGE;
 const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/cjs/utils/swap.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.swapCustomFormatter = exports.formatNumberString = void 0;
+exports.swapNumberMetadata = exports.swapCustomFormatter = exports.formatNumberString = void 0;
 var _number = require("@subwallet/extension-base/utils/number");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -25,6 +25,10 @@ const NUM_1B = new _bignumber.default(1e9);
 const BLIM = new _bignumber.default(1e14);
 const NUM_1M = new _bignumber.default(1e6);
 const NUM_100M = new _bignumber.default(1e8);
+const swapNumberMetadata = {
+  minNumberFormat: 4
+};
+exports.swapNumberMetadata = swapNumberMetadata;
 const swapCustomFormatter = (input, metadata) => {
   const minNumberFormat = 2;
   const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;

package/constants/blocked-actions.d.ts

@@ -25,5 +25,5 @@ export interface OSConfig {
 declare type BlockedConfigObjects = Record<string, EnvConfig>;
 export declare function fetchBlockedConfigObjects(): Promise<BlockedConfigObjects>;
 export declare function getPassConfigId(currentConfig: EnvConfig, blockedConfigObjects: BlockedConfigObjects): string[];
-export declare function fetchLastestBlockedActionsAndFeatures(ids: string[]): Promise<BlockedActionsFeaturesMap[]>;
+export declare function fetchLatestBlockedActionsAndFeatures(ids: string[]): Promise<BlockedActionsFeaturesMap[]>;
 export {};

package/constants/blocked-actions.js

@@ -87,7 +87,7 @@ function isPassVersion(versionStr, versionCondition) {
   const versionConditionStr = versionCondition.trim();
   return versionStr === versionConditionStr;
 }
-export async function fetchLastestBlockedActionsAndFeatures(ids) {
+export async function fetchLatestBlockedActionsAndFeatures(ids) {
   if (ids.length === 0) {
     return [staticData[StaticKey.BLOCKED_ACTIONS_FEATURES]];
   }

package/constants/remind-notification-time.d.ts

@@ -1,2 +1,2 @@
 import { NotificationActionType } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
-export declare const fetchLastestRemindNotificationTime: () => Promise<Record<NotificationActionType, number>>;
+export declare const fetchLatestRemindNotificationTime: () => Promise<Record<NotificationActionType, number>>;

package/constants/remind-notification-time.js

@@ -2,6 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { fetchStaticData } from '@subwallet/extension-base/utils';
-export const fetchLastestRemindNotificationTime = async () => {
+export const fetchLatestRemindNotificationTime = async () => {
   return await fetchStaticData('config/remind-notification-time');
 };

package/core/logic-validation/swap.d.ts

@@ -1,7 +1,18 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { SwapQuote } from '@subwallet/extension-base/types';
 import { AssetHubPreValidationMetadata, ChainflipPreValidationMetadata, HydradxPreValidationMetadata, SimpleSwapValidationMetadata, SwapErrorType } from '@subwallet/extension-base/types/swap';
+interface RequestValidateSwap {
+    chainInfo: _ChainInfo;
+    fromToken: _ChainAsset;
+    fromTokenBalance: string;
+    feeToken: _ChainAsset;
+    feeTokenBalance: string;
+    feeAmount: string;
+    swapAmount: string;
+    minSwapAmount?: string;
+}
 export declare function _validateBalanceToSwapOnAssetHub(fromToken: _ChainAsset, feeToken: _ChainAsset, feeTokenChainInfo: _ChainInfo, feeAmount: string, fromTokenBalance: string, feeTokenBalance: string, swapAmount: string, isXcmOk: boolean, minSwap?: string): TransactionError | undefined;
 export declare function _validateBalanceToSwap(fromToken: _ChainAsset, feeToken: _ChainAsset, feeTokenChainInfo: _ChainInfo, feeAmount: string, fromTokenBalance: string, feeTokenBalance: string, swapAmount: string, isXcmOk: boolean, minSwap?: string): TransactionError | undefined;
 export declare function _validateSwapRecipient(destChainInfo: _ChainInfo, recipient: string): TransactionError | undefined;
@@ -9,3 +20,7 @@ export declare function _getChainflipEarlyValidationError(error: SwapErrorType,
 export declare function _getEarlyHydradxValidationError(error: SwapErrorType, metadata: HydradxPreValidationMetadata): SwapError;
 export declare function _getEarlyAssetHubValidationError(error: SwapErrorType, metadata: AssetHubPreValidationMetadata): SwapError;
 export declare function _getSimpleSwapEarlyValidationError(error: SwapErrorType, metadata: SimpleSwapValidationMetadata): SwapError;
+export declare function _validateQuoteV2(selectedQuote: SwapQuote): TransactionError | undefined;
+export declare function _validateBalanceToSwapV2(request: RequestValidateSwap): TransactionError | undefined;
+export declare function _validateSwapRecipientV2(destChainInfo: _ChainInfo, recipient: string | undefined): TransactionError | undefined;
+export {};

package/core/logic-validation/swap.js

@@ -100,7 +100,7 @@ export function _getChainflipEarlyValidationError(error, metadata) {
     case SwapErrorType.UNKNOWN:
       return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new SwapError(error);
   }
@@ -116,7 +116,7 @@ export function _getEarlyHydradxValidationError(error, metadata) {
     case SwapErrorType.UNKNOWN:
       return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new SwapError(error);
   }
@@ -130,7 +130,7 @@ export function _getEarlyAssetHubValidationError(error, metadata) {
     case SwapErrorType.UNKNOWN:
       return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     case SwapErrorType.MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT:
       return new SwapError(error, 'You swap too much. It make pool not enough existential deposit');
     // TODO: i18n this
@@ -159,8 +159,64 @@ export function _getSimpleSwapEarlyValidationError(error, metadata) {
     case SwapErrorType.UNKNOWN:
       return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new SwapError(error);
   }
+}
+export function _validateQuoteV2(selectedQuote) {
+  if (!selectedQuote) {
+    return new TransactionError(BasicTxErrorType.INTERNAL_ERROR);
+  }
+
+  // Check swapQuote alive
+  if (selectedQuote.aliveUntil <= +Date.now()) {
+    return new TransactionError(SwapErrorType.QUOTE_TIMEOUT);
+  }
+  return undefined;
+}
+export function _validateBalanceToSwapV2(request) {
+  const {
+    chainInfo,
+    feeAmount,
+    feeToken,
+    feeTokenBalance,
+    fromToken,
+    fromTokenBalance,
+    minSwapAmount,
+    swapAmount
+  } = request;
+  const bnFromTokenBalance = BigN(fromTokenBalance);
+  if (new BigN(feeTokenBalance).lte(feeAmount)) {
+    return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, `You don't have enough ${feeToken.symbol} (${chainInfo.name}) to pay transaction fee`);
+  }
+  if (fromToken.slug === feeToken.slug) {
+    // todo: need review and refactor
+    if (bnFromTokenBalance.lte(BigN(feeAmount).plus(swapAmount))) {
+      return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, `Insufficient balance. Deposit ${fromToken.symbol} and try again.`);
+    }
+  } else {
+    if (bnFromTokenBalance.lt(swapAmount)) {
+      return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, `Insufficient balance. Deposit ${fromToken.symbol} and try again.`);
+    }
+  }
+  if (minSwapAmount) {
+    if (bnFromTokenBalance.lte(minSwapAmount)) {
+      const parsedMinSwapValue = formatNumber(minSwapAmount, _getAssetDecimals(fromToken));
+      return new TransactionError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
+    }
+  }
+
+  return undefined;
+}
+export function _validateSwapRecipientV2(destChainInfo, recipient) {
+  if (!recipient) {
+    return undefined;
+  }
+  const isEvmAddress = isEthereumAddress(recipient);
+  const isEvmDestChain = _isChainEvmCompatible(destChainInfo);
+  if (isEvmAddress && !isEvmDestChain || !isEvmAddress && isEvmDestChain) {
+    return new TransactionError(SwapErrorType.INVALID_RECIPIENT);
+  }
+  return undefined;
 }

package/core/utils.js

@@ -146,7 +146,7 @@ export const _isSufficientToken = async (tokenInfo, substrateApi) => {
       queryParams.module = 'assets';
     }
     const metadata = await substrateApi.makeRpcQuery(queryParams);
-    return metadata.isSufficient;
+    return (metadata === null || metadata === void 0 ? void 0 : metadata.isSufficient) || false;
   }
 
   // todo

package/koni/background/handlers/Extension.d.ts

@@ -255,7 +255,6 @@ export default class KoniExtension {
     private subscribeBuyTokens;
     private subscribeBuyServices;
     private subscribeSwapPairs;
-    private getOptimalSwapProcessOnSelectQuote;
     private handleSwapRequest;
     private handleSwapRequestV2;
     private getLatestSwapQuote;

package/koni/background/handlers/Extension.js

@@ -43,7 +43,7 @@ import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setti
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
-import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, SwapProviderId, SwapStepType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, createTransactionFromRLP, detectTransferTxType, getAccountSignMode, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -278,7 +278,6 @@ export default class KoniExtension {
       const transformedAccounts = Object.values(accountProxies);
       responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [combineAllAccountProxy(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
-      console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
     });
     this.createUnsubscriptionHandle(id, () => {
@@ -3617,11 +3616,9 @@ export default class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
-  async getOptimalSwapProcessOnSelectQuote(request) {
-    return this.#koniState.swapService.generateOptimalProcessWithoutPath(request);
-  }
   async handleSwapRequest(request) {
-    return this.#koniState.swapService.handleSwapRequest(request);
+    // @ts-ignore
+    return Promise.resolve(null);
   }
   async handleSwapRequestV2(request) {
     return this.#koniState.swapService.handleSwapRequestV2(request);
@@ -3633,7 +3630,7 @@ export default class KoniExtension {
     return swapQuoteResponse;
   }
   async validateSwapProcess(params) {
-    return this.#koniState.swapService.validateSwapProcess(params);
+    return this.#koniState.swapService.validateSwapProcessV2(params);
   }
   async handleSwapStep(inputData) {
     const {
@@ -3663,7 +3660,7 @@ export default class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const isLastStep = inputData.currentStep + 1 === process.steps.length;
-    const swapValidations = await this.#koniState.swapService.validateSwapProcess({
+    const swapValidations = await this.#koniState.swapService.validateSwapProcessV2({
       address,
       process,
       selectedQuote: quote,
@@ -3687,9 +3684,9 @@ export default class KoniExtension {
           status: StepStatus.FAILED
         });
       }
+      console.log('Error handling process step', e);
       throw e;
     }
-    console.log('swap data', submitData);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3701,17 +3698,12 @@ export default class KoniExtension {
       txChain,
       txData
     } = submitData;
-
-    // const chosenFeeToken = process.steps.findIndex((step) => step.type === SwapStepType.SET_FEE_TOKEN) > -1;
-    // const allowSkipValidation = [ExtrinsicType.SET_FEE_TOKEN, ExtrinsicType.SWAP].includes(extrinsicType);
-
     const eventsHandler = eventEmitter => {
       if (onSend) {
         eventEmitter.on('send', onSend);
       }
     };
     if (processId) {
-      const _step = process.steps[inputData.currentStep];
       if (!this.#koniState.transactionService.checkProcessExist(processId) && step) {
         const combineInfo = {
           provider: quote.provider,
@@ -3729,23 +3721,6 @@ export default class KoniExtension {
           combineInfo,
           steps: inputData.process.steps.map((step, index) => {
             const fee = inputData.process.totalFee[index];
-            if (step.type === SwapStepType.SWAP) {
-              const metadata = {
-                pair: quote.pair,
-                aliveUntil: quote.aliveUntil,
-                fromAmount: quote.fromAmount,
-                rate: quote.rate,
-                provider: quote.provider,
-                route: quote.route,
-                toAmount: quote.toAmount
-              };
-              return {
-                ...step,
-                status: StepStatus.QUEUED,
-                fee,
-                metadata: metadata
-              };
-            }
             return {
               ...step,
               fee,
@@ -3755,34 +3730,6 @@ export default class KoniExtension {
           status: StepStatus.QUEUED
         });
       }
-      const isLastStep = inputData.currentStep === process.steps.length - 1;
-      if (isLastStep) {
-        const metadata = {
-          pair: quote.pair,
-          aliveUntil: quote.aliveUntil,
-          fromAmount: quote.fromAmount,
-          rate: quote.rate,
-          provider: quote.provider,
-          route: quote.route,
-          toAmount: quote.toAmount
-        };
-        const step = {
-          ..._step,
-          // In case one sign, status already set to prepare before
-          status: process.steps.length > 2 ? StepStatus.PREPARE : StepStatus.QUEUED,
-          fee: process.totalFee[inputData.currentStep],
-          metadata: metadata
-        };
-        const combineInfo = {
-          provider: quote.provider,
-          slippage: inputData.slippage,
-          address,
-          recipient,
-          quote,
-          process
-        };
-        await this.#koniState.transactionService.updateProcessInfo(processId, combineInfo, step);
-      }
     }
     if (isPermit) {
       return await this.#koniState.transactionService.handlePermitTransaction({
@@ -4014,32 +3961,10 @@ export default class KoniExtension {
               nextTxType: ExtrinsicType.SWAP
             };
             submitData = async (step, callback) => {
-              const isLastStep = step === stepNums - 1;
               const isPassConfirmation = !callback;
               const onSend = callback
               // eslint-disable-next-line node/no-callback-literal
               ? rs => callback(rs) : undefined;
-              const specialCaseForUniswap = data.quote.provider.id === SwapProviderId.UNISWAP && !!data.process.steps.find(step => step.type === SwapStepType.PERMIT);
-              if (stepNums > 2 && isLastStep && !specialCaseForUniswap) {
-                const quote = data.quote;
-                const latestSwapQuote = await this.getLatestSwapQuote({
-                  address: data.address,
-                  currentQuote: quote.provider,
-                  feeToken: quote.feeInfo.selectedFeeToken,
-                  recipient: data.recipient,
-                  pair: quote.pair,
-                  fromAmount: quote.fromAmount,
-                  slippage: data.slippage
-                });
-                return this.handleSwapStep({
-                  ...data,
-                  quote: latestSwapQuote.optimalQuote || data.quote,
-                  currentStep: step,
-                  isPassConfirmation,
-                  errorOnTimeOut: true,
-                  processId
-                });
-              }
               return this.handleSwapStep({
                 ...data,
                 currentStep: step,
@@ -4740,8 +4665,6 @@ export default class KoniExtension {
       /* Swap service */
       case 'pri(swapService.subscribePairs)':
         return this.subscribeSwapPairs(id, port);
-      case 'pri(swapService.getOptimalProcessOnSelectQuote)':
-        return this.getOptimalSwapProcessOnSelectQuote(request);
       case 'pri(swapService.handleSwapRequest)':
         return this.handleSwapRequest(request);
       case 'pri(swapService.handleSwapRequestV2)':