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

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/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) {