@subwallet/extension-base 1.3.26-0 → 1.3.27-1

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

@@ -8,14 +8,15 @@ exports._isChainSupportedByProvider = exports.SwapService = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 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 _utils = require("@subwallet/extension-base/services/swap-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 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 _utils2 = require("@subwallet/extension-base/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _rxjs = require("rxjs");
 var _simpleswapHandler = require("./handler/simpleswap-handler");
@@ -24,15 +25,15 @@ var _uniswapHandler = require("./handler/uniswap-handler");
 // SPDX-License-Identifier: Apache-2.0
 
 const _isChainSupportedByProvider = (providerSlug, chain) => {
-  const supportedChains = _utils._PROVIDER_TO_SUPPORTED_PAIR_MAP[providerSlug];
+  const supportedChains = _utils2._PROVIDER_TO_SUPPORTED_PAIR_MAP[providerSlug];
   return supportedChains ? supportedChains.includes(chain) : false;
 };
 exports._isChainSupportedByProvider = _isChainSupportedByProvider;
 class SwapService {
   swapPairSubject = new _rxjs.BehaviorSubject([]);
   handlers = {};
-  startPromiseHandler = (0, _utils2.createPromiseHandler)();
-  stopPromiseHandler = (0, _utils2.createPromiseHandler)();
+  startPromiseHandler = (0, _utils3.createPromiseHandler)();
+  stopPromiseHandler = (0, _utils3.createPromiseHandler)();
   status = _types.ServiceStatus.NOT_INITIALIZED;
   constructor(state) {
     this.state = state;
@@ -71,7 +72,8 @@ class SwapService {
   getDefaultProcess(params) {
     const result = {
       totalFee: [_serviceBase.MOCK_STEP_FEE],
-      steps: [_serviceBase.DEFAULT_FIRST_STEP]
+      steps: [_serviceBase.DEFAULT_FIRST_STEP],
+      path: []
     };
     result.totalFee.push({
       feeComponent: [],
@@ -85,6 +87,33 @@ class SwapService {
     });
     return result;
   }
+  getDefaultProcessV2(params) {
+    const result = {
+      totalFee: [_serviceBase.MOCK_STEP_FEE],
+      steps: [_serviceBase.DEFAULT_FIRST_STEP],
+      path: []
+    };
+    const swapPairInfo = params.path[0].pair; // todo: improve for Round 2
+
+    result.totalFee.push({
+      feeComponent: [],
+      feeOptions: [params.request.pair.from],
+      defaultFeeToken: params.request.pair.from
+    });
+    result.steps.push({
+      id: result.steps.length,
+      name: 'Swap',
+      type: _swap.SwapStepType.SWAP,
+      metadata: {
+        sendingValue: params.request.fromAmount.toString(),
+        originTokenInfo: this.chainService.getAssetBySlug(swapPairInfo.from),
+        destinationTokenInfo: this.chainService.getAssetBySlug(swapPairInfo.to)
+      }
+    });
+    return result;
+  }
+
+  // deprecated
   async generateOptimalProcess(params) {
     if (!params.selectedQuote) {
       return this.getDefaultProcess(params);
@@ -99,24 +128,153 @@ class SwapService {
       }
     }
   }
+  async generateOptimalProcessV2(params) {
+    if (!params.selectedQuote) {
+      return this.getDefaultProcessV2(params);
+    } else {
+      var _params$request$curre2;
+      const providerId = ((_params$request$curre2 = params.request.currentQuote) === null || _params$request$curre2 === void 0 ? void 0 : _params$request$curre2.id) || params.selectedQuote.provider.id;
+      const handler = this.handlers[providerId];
+      if (handler) {
+        return handler.generateOptimalProcessV2(params);
+      } else {
+        return this.getDefaultProcessV2(params);
+      }
+    }
+  }
+  async generateOptimalProcessWithoutPath(params) {
+    var _params$request$curre3;
+    if (!params.selectedQuote || params.path.length > 0) {
+      return this.getDefaultProcessV2(params);
+    }
+    const [path, directSwapRequest] = this.getAvailablePath(params.request);
+    if (!directSwapRequest) {
+      return this.getDefaultProcessV2(params);
+    }
+    params.path = path;
+    const providerId = ((_params$request$curre3 = params.request.currentQuote) === null || _params$request$curre3 === void 0 ? void 0 : _params$request$curre3.id) || params.selectedQuote.provider.id;
+    const handler = this.handlers[providerId];
+    if (handler) {
+      return handler.generateOptimalProcessV2(params);
+    } else {
+      return this.getDefaultProcessV2(params);
+    }
+  }
+
+  // deprecated
+  // eslint-disable-next-line @typescript-eslint/require-await
   async handleSwapRequest(request) {
-    /*
-    * 1. Ask swap quotes from providers
-    * 2. Select the best quote
-    * 3. Generate optimal process for that quote
+    /*
+    * 1. Ask swap quotes from providers
+    * 2. Select the best quote
+    * 3. Generate optimal process for that quote
     * */
-    const swapQuoteResponse = await this.getLatestQuotes(request);
-    const optimalProcess = await this.generateOptimalProcess({
+
+    // const swapQuoteResponse = await this.getLatestDirectQuotes(request);
+
+    // const optimalProcess = await this.generateOptimalProcess({
+    //   request,
+    //   selectedQuote: swapQuoteResponse.optimalQuote
+    // });
+
+    return {
+      // @ts-ignore
+      process: null,
+      // @ts-ignore
+      quote: null
+    };
+  }
+  async handleSwapRequestV2(request) {
+    /*
+    * 1. Find available path
+    * 2. Ask swap quotes from providers
+    * 3. Select the best quote
+    * 4. Generate optimal process for that quote
+    * */
+
+    // todo: path will become a list of path in Round 2
+    // const [path, directSwapRequest] = this.getAvailablePath(request);
+    //
+    // if (!directSwapRequest) {
+    //   throw Error('Swap pair not found');
+    // }
+
+    // const swapQuoteResponse = await this.getLatestDirectQuotes(directSwapRequest);
+    const {
+      path,
+      swapQuoteResponse
+    } = await this.getLatestQuoteFromSwapRequest(request);
+    const optimalProcess = await this.generateOptimalProcessV2({
       request,
-      selectedQuote: swapQuoteResponse.optimalQuote
+      selectedQuote: swapQuoteResponse.optimalQuote,
+      path
     });
     return {
       process: optimalProcess,
       quote: swapQuoteResponse
     };
   }
-  async getLatestQuotes(request) {
-    request.pair.metadata = this.getSwapPairMetadata(request.pair.slug); // todo: improve this
+  getAvailablePath(request) {
+    const {
+      pair
+    } = request;
+    // todo: control provider tighter
+    const allSupportedChainsBySwapProvider = [...new Set(Object.values(_utils2._PROVIDER_TO_SUPPORTED_PAIR_MAP).flat())];
+    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 process = [];
+    if (!fromToken || !toToken) {
+      throw Error('Token not found');
+    }
+    if (!fromChain || !toChain) {
+      throw Error('Token metadata error');
+    }
+
+    // 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
+      const swapStep = (0, _utils2.getSwapStep)(fromToken.slug, toToken.slug);
+      process.push(swapStep);
+      return [process, {
+        ...request,
+        pair: swapStep.pair
+      }];
+    }
+
+    // BRIDGE -> SWAP: Try to find a token in dest chain that can bridge from fromToken
+    const bridgeDestination = (0, _utils2.findXcmDestination)(this.chainService.getAssetRefMap(), fromToken, toChain);
+    if (bridgeDestination && allSupportedChainsBySwapProvider.includes(toChain)) {
+      const bridgeStep = (0, _utils2.getBridgeStep)(fromToken.slug, bridgeDestination);
+      const swapStep = (0, _utils2.getSwapStep)(bridgeDestination, toToken.slug);
+      process.push(bridgeStep);
+      process.push(swapStep);
+      return [process, {
+        ...request,
+        address: (0, _utils3.reformatAddress)(request.address, (0, _utils._getChainSubstrateAddressPrefix)(toChainInfo)),
+        pair: swapStep.pair
+      }];
+    }
+
+    // todo: improve to support SWAP -> BRIDGE and BRIDGE -> SWAP -> BRIDGE
+
+    return [[], undefined];
+  }
+  async getLatestQuoteFromSwapRequest(request) {
+    const [path, directSwapRequest] = this.getAvailablePath(request);
+    if (!directSwapRequest) {
+      throw Error('Swap pair not found');
+    }
+    const swapQuoteResponse = await this.getLatestDirectQuotes(directSwapRequest);
+    return {
+      path,
+      swapQuoteResponse
+    };
+  }
+  async getLatestDirectQuotes(request) {
+    // request.pair.metadata = this.getSwapPairMetadata(request.pair.slug); // deprecated
     const quoteAskResponses = await this.askProvidersForQuote(request);
 
     // todo: handle error to return back to UI
@@ -125,7 +283,7 @@ class SwapService {
     const availableQuotes = quoteAskResponses.filter(quote => !quote.error).map(quote => quote.quote);
     let quoteError;
     let selectedQuote;
-    let aliveUntil = +Date.now() + _utils.SWAP_QUOTE_TIMEOUT_MAP.default;
+    let aliveUntil = +Date.now() + _utils2.SWAP_QUOTE_TIMEOUT_MAP.default;
     if (availableQuotes.length === 0) {
       const preferredErrorResp = quoteAskResponses.find(quote => {
         return !!quote.error && ![_swap.SwapErrorType.UNKNOWN, _swap.SwapErrorType.ASSET_NOT_SUPPORTED].includes(quote.error.errorType);
@@ -137,8 +295,8 @@ class SwapService {
       selectedQuote = availableQuotes.find(quote => {
         var _request$currentQuote;
         return quote.provider.id === ((_request$currentQuote = request.currentQuote) === null || _request$currentQuote === void 0 ? void 0 : _request$currentQuote.id);
-      }) || availableQuotes[0];
-      aliveUntil = ((_selectedQuote = selectedQuote) === null || _selectedQuote === void 0 ? void 0 : _selectedQuote.aliveUntil) || +Date.now() + _utils.SWAP_QUOTE_TIMEOUT_MAP.default;
+      }) || availableQuotes[0]; // todo: choose best quote based on rate
+      aliveUntil = ((_selectedQuote = selectedQuote) === null || _selectedQuote === void 0 ? void 0 : _selectedQuote.aliveUntil) || +Date.now() + _utils2.SWAP_QUOTE_TIMEOUT_MAP.default;
     }
     return {
       optimalQuote: selectedQuote,
@@ -207,7 +365,7 @@ class SwapService {
 
     // Update promise handler
     this.startPromiseHandler.resolve();
-    this.stopPromiseHandler = (0, _utils2.createPromiseHandler)();
+    this.stopPromiseHandler = (0, _utils3.createPromiseHandler)();
     this.status = _types.ServiceStatus.STARTED;
   }
   async stop() {
@@ -221,7 +379,7 @@ class SwapService {
     // todo: unsub, persist data,...
 
     this.stopPromiseHandler.resolve();
-    this.startPromiseHandler = (0, _utils2.createPromiseHandler)();
+    this.startPromiseHandler = (0, _utils3.createPromiseHandler)();
     this.status = _types.ServiceStatus.STOPPED;
   }
   waitForStarted() {
@@ -239,20 +397,25 @@ class SwapService {
         from: assetRef.srcAsset,
         to: assetRef.destAsset,
         metadata: {
-          alternativeAsset: (0, _utils.getSwapAltToken)(fromAsset)
+          alternativeAsset: (0, _utils2.getSwapAltToken)(fromAsset)
         }
       };
     });
   }
-  getSwapPairMetadata(slug) {
-    var _this$getSwapPairs$fi;
-    return (_this$getSwapPairs$fi = this.getSwapPairs().find(pair => pair.slug === slug)) === null || _this$getSwapPairs$fi === void 0 ? void 0 : _this$getSwapPairs$fi.metadata;
-  }
+
+  // private getSwapPairMetadata (slug: string): Record<string, any> | undefined {
+  //   return this.getSwapPairs().find((pair) => pair.slug === slug)?.metadata;
+  // }
+
   async validateSwapProcess(params) {
     const providerId = params.selectedQuote.provider.id;
     const handler = this.handlers[providerId];
+    if (params.currentStep > 1) {
+      // only validate from the first step
+      return [];
+    }
     if (handler) {
-      return handler.validateSwapProcess(params);
+      return handler.validateSwapProcessV2(params);
     } else {
       return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR)];
     }
@@ -263,6 +426,7 @@ class SwapService {
       // todo: do better to handle error generating steps
       return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR, 'Please check your network and try again'));
     }
+    console.log('handling swap process: ', params.process);
     if (handler) {
       return handler.handleSwapProcess(params);
     } else {
@@ -279,7 +443,7 @@ class SwapService {
           from: assetRef.srcAsset,
           to: assetRef.destAsset,
           metadata: {
-            alternativeAsset: (0, _utils.getSwapAltToken)(fromAsset)
+            alternativeAsset: (0, _utils2.getSwapAltToken)(fromAsset)
           }
         };
       });

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DynamicSwapType = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+let DynamicSwapType;
+exports.DynamicSwapType = DynamicSwapType;
+(function (DynamicSwapType) {
+  DynamicSwapType["SWAP"] = "SWAP";
+  DynamicSwapType["BRIDGE"] = "BRIDGE";
+})(DynamicSwapType || (exports.DynamicSwapType = DynamicSwapType = {}));

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

@@ -4,17 +4,25 @@ 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.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.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.calculateSwapRate = calculateSwapRate;
 exports.convertSwapRate = convertSwapRate;
+exports.findXcmDestination = findXcmDestination;
+exports.getBridgeStep = getBridgeStep;
 exports.getChainflipBroker = getChainflipBroker;
 exports.getChainflipOptions = getChainflipOptions;
 exports.getChainflipSwap = getChainflipSwap;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
+exports.getSwapStep = getSwapStep;
+exports.getTokenPairFromStep = getTokenPairFromStep;
+exports.isChainsHasSameProvider = isChainsHasSameProvider;
 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"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -43,16 +51,24 @@ const SWAP_QUOTE_TIMEOUT_MAP = {
 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.HYDRADX_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
   [_swap.SwapProviderId.CHAIN_FLIP_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.ARBITRUM],
-  [_swap.SwapProviderId.CHAIN_FLIP_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
   [_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'],
-  [_swap.SwapProviderId.SIMPLE_SWAP]: ['bittensor', _chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.POLKADOT]
+  [_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 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;
@@ -105,4 +121,64 @@ function getChainflipSwap(isTestnet) {
   } else {
     return `https://chainflip-broker.io/swap?apikey=${_chainflipHandler.CHAINFLIP_BROKER_API}`;
   }
+}
+function getBridgeStep(from, to) {
+  return {
+    action: _interface.DynamicSwapType.BRIDGE,
+    pair: {
+      slug: `${from}___${to}`,
+      from,
+      to
+    }
+  };
+}
+function getSwapStep(from, to) {
+  return {
+    action: _interface.DynamicSwapType.SWAP,
+    pair: {
+      slug: `${from}___${to}`,
+      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);
+  if (foundAssetRef) {
+    return foundAssetRef.destAsset;
+  }
+  return undefined;
+}
+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 getTokenPairFromStep(steps) {
+  const mainSteps = steps.filter(step => step.type !== _types2.CommonStepType.DEFAULT);
+  if (!mainSteps.length) {
+    return undefined;
+  }
+  if (mainSteps.length === 1) {
+    const metadata = mainSteps[0].metadata; // todo: temp for round 1, the exact interface is handle in round 2
+
+    return {
+      from: metadata.originTokenInfo.slug,
+      to: metadata.destinationTokenInfo.slug,
+      slug: `${metadata.originTokenInfo.slug}___${metadata.destinationTokenInfo.slug}`
+    };
+  }
+  const firstStep = mainSteps[0];
+  const lastStep = mainSteps[mainSteps.length - 1];
+  const firstMetadata = firstStep.metadata;
+  const lastMetadata = lastStep.metadata;
+  return {
+    from: firstMetadata.originTokenInfo.slug,
+    to: lastMetadata.destinationTokenInfo.slug,
+    slug: `${firstMetadata.originTokenInfo.slug}___${lastMetadata.destinationTokenInfo.slug}`
+  };
 }

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

@@ -44,6 +44,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('laos.statescan.io')) {
     return '#/accounts';
   }
+  if (explorerLink.includes('polimec.statescan.io')) {
+    return '#/accounts';
+  }
   if (explorerLink.includes('explorer.zkverify.io')) {
     return 'account';
   }
@@ -65,7 +68,7 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
-  if (['invarch', 'tangle'].includes(chainInfo.slug)) {
+  if (['invarch', 'tangle', 'polimec'].includes(chainInfo.slug)) {
     return '#/extrinsics';
   }
   return 'extrinsic';

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

@@ -1,4 +1,8 @@
+import { _ChainAsset } from '@subwallet/chain-list/types';
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import BigN from 'bignumber.js';
 export * from './swap';
 export * from './request';
 export * from './earning';
 export * from './transfer';
+export declare function validateSpendingAndFeePayment(spendingToken: _ChainAsset, feeToken: _ChainAsset, bnSpendingAmount: BigN, bnFromTokenBalance: BigN, bnFeeAmount: BigN, bnFeeTokenBalance: BigN): TransactionError[];

package/core/logic-validation/index.js

@@ -1,7 +1,28 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { _getTokenMinAmount, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
+import { t } from 'i18next';
 export * from "./swap.js";
 export * from "./request.js";
 export * from "./earning.js";
-export * from "./transfer.js";
+export * from "./transfer.js";
+
+// apply for all tx: transfer, xcm, swap, earning
+export function validateSpendingAndFeePayment(spendingToken, feeToken, bnSpendingAmount, bnFromTokenBalance, bnFeeAmount, bnFeeTokenBalance) {
+  if (spendingToken.slug === feeToken.slug) {
+    if (bnFromTokenBalance.lte(bnSpendingAmount.plus(bnFeeAmount).plus(_isNativeToken(spendingToken) ? '0' : _getTokenMinAmount(spendingToken)))) {
+      return [new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t(`Insufficient balance. Deposit ${spendingToken.symbol} and try again.`))];
+    }
+  } else {
+    if (bnFromTokenBalance.lte(bnSpendingAmount.plus(_isNativeToken(spendingToken) ? '0' : _getTokenMinAmount(spendingToken)))) {
+      return [new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t(`Insufficient balance. Deposit ${spendingToken.symbol} and try again.`))];
+    }
+    if (bnFeeTokenBalance.lte(bnFeeAmount.plus(_isNativeToken(feeToken) ? '0' : _getTokenMinAmount(feeToken)))) {
+      return [new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, t(`Insufficient balance. Deposit ${feeToken.symbol} and try again.`))];
+    }
+  }
+  return [];
+}

package/core/utils.d.ts

@@ -1,5 +1,7 @@
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { LedgerMustCheckType, ValidateRecipientParams } from '@subwallet/extension-base/core/types';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { AccountJson } from '@subwallet/extension-base/types';
 export declare function getStrictMode(type: string, extrinsicType?: ExtrinsicType): boolean;
 export declare function _getAppliedExistentialDeposit(existentialDeposit: string, strictMode?: boolean): bigint;
@@ -13,3 +15,4 @@ export declare function _isValidTonAddressFormat(validateRecipientParams: Valida
 export declare function _isValidCardanoAddressFormat(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isNotDuplicateAddress(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isSupportLedgerAccount(validateRecipientParams: ValidateRecipientParams): string;
+export declare const _isSufficientToken: (tokenInfo: _ChainAsset, substrateApi: _SubstrateApi) => Promise<boolean>;

package/core/utils.js

@@ -1,10 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { _AssetType } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 import { tonAddressInfo } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
-import { _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
+import { _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isBridgedToken, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { isAddressAndChainCompatible, isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
 import { isAddress, isCardanoTestnetAddress, isTonAddress } from '@subwallet/keyring';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -129,4 +131,22 @@ export function _isSupportLedgerAccount(validateRecipientParams) {
     }
   }
   return '';
-}
+}
+export const _isSufficientToken = async (tokenInfo, substrateApi) => {
+  if (SUFFICIENT_CHAIN.includes(tokenInfo.originChain) && tokenInfo.assetType !== _AssetType.NATIVE) {
+    const assetId = _isBridgedToken(tokenInfo) ? _getXcmAssetMultilocation(tokenInfo) : _getTokenOnChainAssetId(tokenInfo);
+    const queryParams = {
+      section: 'query',
+      module: 'foreignAssets',
+      method: 'asset',
+      args: [assetId]
+    };
+    if (!_isBridgedToken(tokenInfo)) {
+      queryParams.module = 'assets';
+    }
+    const metadata = await substrateApi.makeRpcQuery(queryParams);
+    return metadata.isSufficient;
+  } else {
+    return false;
+  }
+};

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

@@ -135,7 +135,6 @@ export default class KoniExtension {
     private recoverDotSamaApi;
     private validateERC721Token;
     private upsertCustomToken;
-    private isSufficientToken;
     private deleteCustomAsset;
     private validateCustomAsset;
     private getAddressTransferableBalance;
@@ -255,8 +254,9 @@ export default class KoniExtension {
     private subscribeBuyTokens;
     private subscribeBuyServices;
     private subscribeSwapPairs;
-    private generateOptimalProcess;
+    private getOptimalSwapProcessOnSelectQuote;
     private handleSwapRequest;
+    private handleSwapRequestV2;
     private getLatestSwapQuote;
     private validateSwapProcess;
     private handleSwapStep;