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

package/services/swap-service/index.js

@@ -1,22 +1,21 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { _AssetRefPath } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { fetchBlockedConfigObjects, fetchLatestBlockedActionsAndFeatures, getPassConfigId } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getAssetOriginChain, _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetOriginChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { AssetHubSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/asset-hub';
 import { ChainflipSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { HydradxHandler } from '@subwallet/extension-base/services/swap-service/handler/hydradx-handler';
-import { findAllBridgeDestinations, findBridgeTransitDestination, findSwapTransitDestination, getBridgeStep, getSupportedSwapChains, getSwapAltToken, getSwapStep, getTokenPairFromStep, isChainsHasSameProvider, processStepsToPathActions, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { OptimexHandler } from '@subwallet/extension-base/services/swap-service/handler/optimex-handler';
+import { getSwapAltToken, getTokenPairFromStep, processStepsToPathActions, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
 import { BasicTxErrorType, DynamicSwapType } from '@subwallet/extension-base/types';
 import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { _SUPPORTED_SWAP_PROVIDERS, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
-import { _reformatAddressWithChain, createPromiseHandler, reformatAddress } from '@subwallet/extension-base/utils';
+import { _reformatAddressWithChain, createPromiseHandler } from '@subwallet/extension-base/utils';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -107,6 +106,7 @@ export class SwapService {
       const providerId = ((_params$request$curre = params.request.currentQuote) === null || _params$request$curre === void 0 ? void 0 : _params$request$curre.id) || params.selectedQuote.provider.id;
       const handler = this.handlers[providerId];
       if (handler) {
+        // todo: handle error response from generateOptimalProcess
         return handler.generateOptimalProcessV2(params);
       } else {
         return this.getDefaultProcessV2(params);
@@ -144,6 +144,12 @@ export class SwapService {
     } catch (e) {
       throw new Error(e.message);
     }
+
+    // override fee for quote because some cases need estimate network fee on Extension (i.e. Optimex)
+    if (swapQuoteResponse.optimalQuote) {
+      const swapIndex = optimalProcess.steps.findIndex(step => step.type === SwapStepType.SWAP);
+      swapQuoteResponse.optimalQuote.feeInfo.feeComponent = optimalProcess.totalFee[swapIndex].feeComponent;
+    }
     if (swapQuoteResponse.error) {
       return {
         process: optimalProcess,
@@ -160,115 +166,6 @@ export class SwapService {
       quote: swapQuoteResponse
     };
   }
-
-  // todo: rewrite this function
-  getAvailablePath(request) {
-    const {
-      address,
-      pair
-    } = request;
-    // todo: control provider tighter
-    const supportSwapChains = getSupportedSwapChains();
-    const fromToken = this.chainService.getAssetBySlug(pair.from);
-    const toToken = this.chainService.getAssetBySlug(pair.to);
-    const fromChain = _getAssetOriginChain(fromToken);
-    const toChain = _getAssetOriginChain(toToken);
-    const toChainInfo = this.chainService.getChainInfoByKey(toChain);
-    const assetRefMap = this.chainService.getAssetRefMap();
-    let process = [];
-    if (!fromToken || !toToken) {
-      throw Error('Token not found');
-    }
-    if (!fromChain || !toChain) {
-      throw Error('Token metadata error');
-    }
-    const directXcmRef = Object.values(assetRefMap).find(assetRef => assetRef.path === _AssetRefPath.XCM && assetRef.srcAsset === fromToken.slug && assetRef.destAsset === toToken.slug);
-    if (directXcmRef) {
-      return [[], undefined];
-    }
-
-    // SWAP: 2 tokens in the same chain and chain has dex
-    if (isChainsHasSameProvider(fromChain, toChain)) {
-      // there's a dex that can support direct swapping
-      process.push(getSwapStep(fromToken.slug, toToken.slug));
-      return [process, request];
-    }
-
-    // ------------------------
-    // BRIDGE -> SWAP: Try to find a token in dest chain that can bridge from fromToken
-    const bridgeTransit = findBridgeTransitDestination(assetRefMap, fromToken, toToken);
-    if (bridgeTransit && supportSwapChains.includes(toChain)) {
-      const swapStep = getSwapStep(bridgeTransit, toToken.slug);
-      process.push(getBridgeStep(fromToken.slug, bridgeTransit));
-      process.push(swapStep);
-      return [process, {
-        ...request,
-        address: reformatAddress(address, _getChainSubstrateAddressPrefix(toChainInfo)),
-        pair: swapStep.pair
-      }];
-    }
-
-    // ------------------------
-    // SWAP -> BRIDGE: Try to find a token in from chain that can bridge to toToken
-    const swapTransit = findSwapTransitDestination(assetRefMap, fromToken, toToken);
-    if (swapTransit && supportSwapChains.includes(fromChain)) {
-      const swapStep = getSwapStep(fromToken.slug, swapTransit);
-      process.push(swapStep);
-      process.push(getBridgeStep(swapTransit, toToken.slug));
-      return [process, {
-        ...request,
-        pair: swapStep.pair
-      }];
-    }
-
-    // ------------------------
-    // BRIDGE -> SWAP -> BRIDGE: Try to find a tri-step path to swap
-    const processList = [];
-    const swapPairList = [];
-    const allBridgeDestinations = findAllBridgeDestinations(assetRefMap, fromToken);
-
-    // currently find first path. Todo: return all paths or best path.
-    for (const bridgeTransit of allBridgeDestinations) {
-      process = [];
-      const bridgeDestinationInfo = this.chainService.getAssetBySlug(bridgeTransit);
-      const swapTransit = findSwapTransitDestination(assetRefMap, bridgeDestinationInfo, toToken);
-      if (bridgeTransit === swapTransit) {
-        continue;
-      }
-      if (swapTransit && supportSwapChains.includes(bridgeDestinationInfo.originChain)) {
-        const swapStep = getSwapStep(bridgeTransit, swapTransit);
-        process.push(getBridgeStep(fromToken.slug, bridgeTransit));
-        process.push(swapStep);
-        process.push(getBridgeStep(swapTransit, toToken.slug));
-
-        // set the highest priority to hydration provider
-        if (bridgeDestinationInfo.originChain === COMMON_CHAIN_SLUGS.HYDRADX) {
-          return [process, {
-            ...request,
-            address: _reformatAddressWithChain(address, this.chainService.getChainInfoByKey(COMMON_CHAIN_SLUGS.HYDRADX)),
-            pair: swapStep.pair
-          }];
-        }
-        processList.push(process);
-        swapPairList.push(swapStep.pair);
-      }
-    }
-
-    // get first process
-    if (processList.length && swapPairList.length) {
-      const [firstProcess, firstSwapPair] = [processList[0], swapPairList[0]];
-      const chainSwap = this.chainService.getAssetBySlug(firstSwapPair.from).originChain;
-      return [firstProcess, {
-        ...request,
-        address: _reformatAddressWithChain(address, this.chainService.getChainInfoByKey(chainSwap)),
-        pair: firstSwapPair
-      }];
-    }
-
-    // todo: encapsulate each route type to function
-
-    return [[], undefined];
-  }
   async getLatestQuoteFromSwapRequest(request) {
     let availablePath;
     try {
@@ -368,9 +265,6 @@ export class SwapService {
         case SwapProviderId.CHAIN_FLIP_MAINNET:
           this.handlers[providerId] = new ChainflipSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
-        case SwapProviderId.HYDRADX_TESTNET:
-          this.handlers[providerId] = new HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService);
-          break;
         case SwapProviderId.HYDRADX_MAINNET:
           this.handlers[providerId] = new HydradxHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
           break;
@@ -380,12 +274,6 @@ export class SwapService {
         case SwapProviderId.KUSAMA_ASSET_HUB:
           this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'statemine');
           break;
-        // case SwapProviderId.ROCOCO_ASSET_HUB:
-        //   this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'rococo_assethub');
-        //   break;
-        case SwapProviderId.WESTEND_ASSET_HUB:
-          this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'westend_assethub');
-          break;
         case SwapProviderId.SIMPLE_SWAP:
           this.handlers[providerId] = new SimpleSwapHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;
@@ -395,6 +283,12 @@ export class SwapService {
         case SwapProviderId.KYBER:
           this.handlers[providerId] = new KyberHandler(this.chainService, this.state.balanceService, this.state.transactionService, this.state.feeService);
           break;
+        case SwapProviderId.OPTIMEX:
+          this.handlers[providerId] = new OptimexHandler(this.chainService, this.state.balanceService, this.state.feeService, false);
+          break;
+        case SwapProviderId.OPTIMEX_TESTNET:
+          this.handlers[providerId] = new OptimexHandler(this.chainService, this.state.balanceService, this.state.feeService, true);
+          break;
         default:
           throw new Error('Unsupported provider');
       }
@@ -445,6 +339,8 @@ export class SwapService {
   waitForStopped() {
     return this.stopPromiseHandler.promise;
   }
+
+  // todo: deprecated
   getSwapPairs() {
     return Object.entries(this.chainService.swapRefMap).map(([slug, assetRef]) => {
       const fromAsset = this.chainService.getAssetBySlug(assetRef.srcAsset);
@@ -499,6 +395,8 @@ export class SwapService {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }
   }
+
+  // todo: deprecated
   subscribeSwapPairs(callback) {
     return this.chainService.subscribeSwapRefMap().subscribe(refMap => {
       const latestData = Object.entries(refMap).map(([slug, assetRef]) => {

package/services/swap-service/utils.d.ts

@@ -1,25 +1,14 @@
-import { _AssetRef, _ChainAsset } from '@subwallet/chain-list/types';
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { CommonStepDetail, DynamicSwapAction, DynamicSwapType } from '@subwallet/extension-base/types';
 import { SwapPair } from '@subwallet/extension-base/types/swap';
 export declare const CHAIN_FLIP_TESTNET_EXPLORER = "https://blocks-perseverance.chainflip.io";
 export declare const CHAIN_FLIP_MAINNET_EXPLORER = "https://scan.chainflip.io";
 export declare const SIMPLE_SWAP_EXPLORER = "https://simpleswap.io";
-export declare const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING: Record<string, string>;
 export declare const SWAP_QUOTE_TIMEOUT_MAP: Record<string, number>;
-export declare const _PROVIDER_TO_SUPPORTED_PAIR_MAP: Record<string, string[]>;
 export declare const FEE_RATE_MULTIPLIER: Record<string, number>;
-export declare function getSupportedSwapChains(): string[];
 export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | undefined;
 export declare function getSwapAltToken(chainAsset: _ChainAsset): string | undefined;
-export declare function calculateSwapRate(fromAmount: string, toAmount: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
-export declare function convertSwapRate(rate: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
-export declare function getBridgeStep(from: string, to: string): DynamicSwapAction;
-export declare function getSwapStep(from: string, to: string): DynamicSwapAction;
-export declare function findBridgeTransitDestination(assetRefMap: Record<string, _AssetRef>, fromToken: _ChainAsset, toToken: _ChainAsset): string | undefined;
-export declare function findSwapTransitDestination(assetRefMap: Record<string, _AssetRef>, fromToken: _ChainAsset, toToken: _ChainAsset): string | undefined;
-export declare function findAllBridgeDestinations(assetRefMap: Record<string, _AssetRef>, fromToken: _ChainAsset): string[];
 export declare function getAmountAfterSlippage(amount: string, slippage: number): string;
-export declare function isChainsHasSameProvider(fromChain: string, toChain: string): boolean;
 export declare function getLastAmountFromSteps(steps: CommonStepDetail[]): string | undefined;
 export declare function getFirstAmountFromSteps(steps: CommonStepDetail[]): string | undefined;
 export declare function getChainRouteFromSteps(steps: CommonStepDetail[]): string[];
@@ -27,3 +16,8 @@ export declare function getTokenPairFromStep(steps: CommonStepDetail[]): SwapPai
 export declare function getSwapChainsFromPath(path: DynamicSwapAction[]): string[];
 export declare function processStepsToPathActions(steps: CommonStepDetail[]): DynamicSwapType[];
 export declare const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04;
+export declare const DetectedGenOptimalProcessErrMsg: {
+    AMOUNT_TOO_LOW: string;
+    AMOUNT_TOO_HIGH: string;
+    NOT_ENOUGHT_BITCOIN: string;
+};

package/services/swap-service/utils.js

@@ -1,24 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { _AssetRefPath } from '@subwallet/chain-list/types';
-import { _getAssetDecimals, _getAssetOriginChain, _getOriginChainOfAsset, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getOriginChainOfAsset, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { CommonStepType, DynamicSwapType, SwapStepType } from '@subwallet/extension-base/types';
 import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
 export const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 export const SIMPLE_SWAP_EXPLORER = 'https://simpleswap.io';
-
-// Deprecated
-export const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
-  'bittensor-NATIVE-TAO': 'tao',
-  [COMMON_ASSETS.ETH]: 'eth',
-  [COMMON_ASSETS.DOT]: 'dot',
-  [COMMON_ASSETS.USDC_ETHEREUM]: 'usdc',
-  [COMMON_ASSETS.USDT_ETHEREUM]: 'usdterc20'
-};
 export const SWAP_QUOTE_TIMEOUT_MAP = {
   // in milliseconds
   default: 90000,
@@ -26,29 +15,11 @@ export const SWAP_QUOTE_TIMEOUT_MAP = {
   [SwapProviderId.CHAIN_FLIP_MAINNET]: 30000,
   error: 10000
 };
-
-// deprecated
-export const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
-  [SwapProviderId.HYDRADX_MAINNET]: [COMMON_CHAIN_SLUGS.HYDRADX],
-  [SwapProviderId.CHAIN_FLIP_MAINNET]: [COMMON_CHAIN_SLUGS.POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.ARBITRUM],
-  [SwapProviderId.POLKADOT_ASSET_HUB]: [COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
-  [SwapProviderId.KUSAMA_ASSET_HUB]: [COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],
-  [SwapProviderId.SIMPLE_SWAP]: ['bittensor', COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.POLKADOT],
-  [SwapProviderId.UNISWAP]: [COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.ARBITRUM],
-  // testnet
-  [SwapProviderId.CHAIN_FLIP_TESTNET]: [COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
-  [SwapProviderId.HYDRADX_TESTNET]: [COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
-  [SwapProviderId.ROCOCO_ASSET_HUB]: [COMMON_CHAIN_SLUGS.ROCOCO_ASSET_HUB],
-  [SwapProviderId.WESTEND_ASSET_HUB]: ['westend_assethub']
-};
 export const FEE_RATE_MULTIPLIER = {
   default: 1,
   medium: 1.2,
   high: 2
 };
-export function getSupportedSwapChains() {
-  return [...new Set(Object.values(_PROVIDER_TO_SUPPORTED_PAIR_MAP).flat())];
-}
 export 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;
@@ -57,116 +28,9 @@ export function getSwapAltToken(chainAsset) {
   var _chainAsset$metadata;
   return (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.alternativeSwapAsset;
 }
-export function calculateSwapRate(fromAmount, toAmount, fromAsset, toAsset) {
-  const bnFromAmount = BigN(fromAmount);
-  const bnToAmount = BigN(toAmount);
-  const decimalDiff = _getAssetDecimals(toAsset) - _getAssetDecimals(fromAsset);
-  const bnRate = bnFromAmount.div(bnToAmount);
-  return 1 / bnRate.times(10 ** decimalDiff).toNumber();
-}
-export function convertSwapRate(rate, fromAsset, toAsset) {
-  const decimalDiff = _getAssetDecimals(toAsset) - _getAssetDecimals(fromAsset);
-  const bnRate = BigN(rate);
-  return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
-}
-
-// export function getChainflipOptions (isTestnet: boolean) {
-//   if (isTestnet) {
-//     return {
-//       network: getChainflipNetwork(isTestnet)
-//     };
-//   }
-
-//   return {
-//     network: getChainflipNetwork(isTestnet),
-//     broker: getChainflipBroker(isTestnet)
-//   };
-// }
-
-// function getChainflipNetwork (isTestnet: boolean) {
-//   return isTestnet ? 'perseverance' : 'mainnet';
-// }
-
-// export function getChainflipBroker (isTestnet: boolean) { // noted: currently not use testnet broker
-//   if (isTestnet) {
-//     return {
-//       url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
-//     };
-//   } else {
-//     return {
-//       url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
-//     };
-//   }
-// }
-
-// export function getChainflipSwap (isTestnet: boolean) {
-//   if (isTestnet) {
-//     return `https://perseverance.chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
-//   } else {
-//     return `https://chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
-//   }
-// }
-
-// export function getAssetsUrl (isTestnet: boolean) {
-//   if (isTestnet) {
-//     return 'https://perseverance.chainflip-broker.io/assets';
-//   } else {
-//     return 'https://chainflip-broker.io/assets';
-//   }
-// }
-
-export function getBridgeStep(from, to) {
-  return {
-    action: DynamicSwapType.BRIDGE,
-    pair: {
-      slug: `${from}___${to}`,
-      // todo: recheck with assetRef format from chain list
-      from,
-      to
-    }
-  };
-}
-export function getSwapStep(from, to) {
-  return {
-    action: DynamicSwapType.SWAP,
-    pair: {
-      slug: `${from}___${to}`,
-      // todo: recheck with assetRef format from chain list
-      from,
-      to
-    }
-  };
-}
-export function findBridgeTransitDestination(assetRefMap, fromToken, toToken) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.destChain === _getAssetOriginChain(toToken) && assetRef.path === _AssetRefPath.XCM);
-  if (foundAssetRef) {
-    return foundAssetRef.destAsset;
-  }
-  return undefined;
-}
-export function findSwapTransitDestination(assetRefMap, fromToken, toToken) {
-  const foundAssetRef = Object.values(assetRefMap).find(assetRef => assetRef.destAsset === toToken.slug && assetRef.srcChain === _getAssetOriginChain(fromToken) && assetRef.path === _AssetRefPath.XCM);
-  if (foundAssetRef) {
-    return foundAssetRef.srcAsset;
-  }
-  return undefined;
-}
-export function findAllBridgeDestinations(assetRefMap, fromToken) {
-  const foundAssetRefs = Object.values(assetRefMap).filter(assetRef => assetRef.srcAsset === fromToken.slug && assetRef.path === _AssetRefPath.XCM);
-  return foundAssetRefs.map(assetRef => assetRef.destAsset);
-}
 export function getAmountAfterSlippage(amount, slippage) {
   return BigN(amount).multipliedBy(BigN(1).minus(BigN(slippage))).integerValue(BigN.ROUND_DOWN).toString();
 }
-export 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;
-}
 export function getLastAmountFromSteps(steps) {
   var _lastStep$metadata;
   const lastStep = steps[steps.length - 1]; // last step
@@ -265,4 +129,10 @@ export function processStepsToPathActions(steps) {
   }
   return path;
 }
-export const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04; // add 2%
+export const DEFAULT_EXCESS_AMOUNT_WEIGHT = 1.04; // add 2%
+
+export const DetectedGenOptimalProcessErrMsg = {
+  AMOUNT_TOO_LOW: 'amount too low',
+  AMOUNT_TOO_HIGH: 'amount too high',
+  NOT_ENOUGHT_BITCOIN: 'for the transaction. lower your btc amount and try again' // todo: improve handle msg error
+};

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

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

package/types/balance/transfer.d.ts

@@ -17,6 +17,7 @@ export interface ResponseSubscribeTransfer {
     feeType: FeeChainType;
     feePercentageSpecialCase?: number;
     error?: string;
+    isEvmRpcError?: boolean;
 }
 export interface RequestSubmitTransferWithId extends RequestSubmitTransfer {
     id?: string;

package/types/service-base.d.ts

@@ -1,7 +1,5 @@
-import { DynamicSwapAction, OptimalSwapPathParamsV2, SwapFeeType, SwapStepType } from '@subwallet/extension-base/types/swap';
-import { OptimalYieldPath, OptimalYieldPathParams, YieldStepType } from '@subwallet/extension-base/types/yield';
-export declare type OptimalProcessParams = OptimalYieldPathParams | OptimalSwapPathParamsV2;
-export declare type OptimalProcessResult = OptimalYieldPath | CommonOptimalSwapPath;
+import { DynamicSwapAction, SwapFeeType, SwapStepType } from '@subwallet/extension-base/types/swap';
+import { YieldStepType } from '@subwallet/extension-base/types/yield';
 export declare enum CommonStepType {
     DEFAULT = "DEFAULT",
     XCM = "XCM",
@@ -21,6 +19,7 @@ export interface CommonFeeComponent {
     amount: string;
     tokenSlug: string;
     percentage?: number;
+    metadata?: any;
 }
 export interface CommonStepFeeInfo {
     feeComponent: CommonFeeComponent[];

package/types/service-base.js

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-/* ServiceWithProcess */
-
 export let CommonStepType;
 (function (CommonStepType) {
   CommonStepType["DEFAULT"] = "DEFAULT";

package/types/swap/index.d.ts

@@ -63,7 +63,9 @@ export declare enum SwapProviderId {
     WESTEND_ASSET_HUB = "WESTEND_ASSET_HUB",
     SIMPLE_SWAP = "SIMPLE_SWAP",
     UNISWAP = "UNISWAP",
-    KYBER = "KYBER"
+    KYBER = "KYBER",
+    OPTIMEX = "OPTIMEX",
+    OPTIMEX_TESTNET = "OPTIMEX_TESTNET"
 }
 export declare const _SUPPORTED_SWAP_PROVIDERS: SwapProviderId[];
 export interface SwapProvider {

package/types/swap/index.js

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

package/types/yield/info/account/info.d.ts

@@ -48,6 +48,11 @@ export interface AbstractYieldPositionInfo extends BaseYieldPositionInfo {
         subnetShortName: string;
         originalTotalStake: string;
     };
+    metadata?: {
+        pendingStake?: string;
+        compoundingStake?: string;
+        manualStake?: string;
+    };
 }
 /**
  * @interface SpecialYieldPositionInfo

package/utils/account/common.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { _chainInfoToChainType, _getChainSubstrateAddressPrefix, _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _chainInfoToAccountChainType, _getChainSubstrateAddressPrefix, _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { AccountChainType } from '@subwallet/extension-base/types';
 import { getAccountChainTypeFromKeypairType, pairToAccount } from '@subwallet/extension-base/utils';
 import { decodeAddress, encodeAddress, getKeypairTypeByAddress, isAddress, isBitcoinAddress, isCardanoAddress, isTonAddress } from '@subwallet/keyring';
@@ -41,8 +41,7 @@ export function reformatAddress(address, networkPrefix = 42, isEthereum = false,
   }
 }
 export const _reformatAddressWithChain = (address, chainInfo) => {
-  // todo: check for cardano
-  const chainType = _chainInfoToChainType(chainInfo);
+  const chainType = _chainInfoToAccountChainType(chainInfo);
   if (chainType === AccountChainType.SUBSTRATE) {
     return reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo));
   } else if (chainType === AccountChainType.TON || chainType === AccountChainType.CARDANO) {

package/utils/fee/transfer.js

@@ -96,6 +96,7 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
   let feeOptions;
   let maxTransferable;
   let error;
+  let isEvmRpcError = false;
   const fakeAddress = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
   const substrateAddress = fakeAddress; // todo: move this
   const evmAddress = u8aToHex(addressToEvm(fakeAddress)); // todo: move this
@@ -120,6 +121,9 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
           value,
           fallbackFee: true
         });
+        if (error) {
+          isEvmRpcError = true;
+        }
       } else {
         [transaction,, error] = await getEVMTransactionObject({
           chain: srcChain.slug,
@@ -133,6 +137,9 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
           value,
           fallbackFee: true
         });
+        if (error) {
+          isEvmRpcError = true;
+        }
       }
     } else if (isTonAddress(address) && _isTokenTransferredByTon(srcToken)) {
       [transaction] = await createTonTransaction({
@@ -307,7 +314,8 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,
-    error
+    error,
+    isEvmRpcError: isEvmRpcError
   };
 };
 export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {

package/utils/staticData/assetHubStaking.json

@@ -1 +1,6 @@
-{}
+{
+  "westend": "westend_assethub",
+  "paseoTest": "paseo_assethub",
+  "kusama": "statemine",
+  "polkadot": "statemint"
+}