@subwallet/extension-base 1.2.28-0 → 1.2.30-0

package/cjs/core/substrate/xcm-parser.js

@@ -9,6 +9,7 @@ exports._getXcmDestWeight = _getXcmDestWeight;
 exports._getXcmMultiAssets = _getXcmMultiAssets;
 exports._getXcmMultiLocation = _getXcmMultiLocation;
 exports._getXcmUnstableWarning = _getXcmUnstableWarning;
+exports._isMythosFromHydrationToMythos = _isMythosFromHydrationToMythos;
 exports._isSnowBridgeXcm = _isSnowBridgeXcm;
 exports._isXcmTransferUnstable = _isXcmTransferUnstable;
 exports._isXcmWithinSameConsensus = _isXcmWithinSameConsensus;
@@ -60,8 +61,8 @@ function _getXcmMultiLocation(originChainInfo, destChainInfo, version, recipient
     }
   };
 }
-function _isXcmTransferUnstable(originChainInfo, destChainInfo) {
-  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo);
+function _isXcmTransferUnstable(originChainInfo, destChainInfo, assetSlug) {
+  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) || _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug);
 }
 function getAssetHubBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
@@ -76,16 +77,21 @@ function getAssetHubBridgeUnstableWarning(originChainInfo) {
 function getSnowBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
     case _chainList.COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 70$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $70 and takes up to 1 hour to complete. Continue at your own risk';
     case _chainList.COMMON_CHAIN_SLUGS.ETHEREUM:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 5$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $5 and takes up to 1 hour to complete. Continue at your own risk';
     default:
       return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a high fee and takes up to 1 hour to complete. Continue at your own risk';
   }
 }
-function _getXcmUnstableWarning(originChainInfo, destChainInfo) {
+function getMythosFromHydrationToMythosWarning() {
+  return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
+}
+function _getXcmUnstableWarning(originChainInfo, destChainInfo, assetSlug) {
   if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
+  } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
+    return getMythosFromHydrationToMythosWarning();
   } else {
     return getAssetHubBridgeUnstableWarning(originChainInfo);
   }
@@ -96,6 +102,9 @@ function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
 function _isSnowBridgeXcm(originChainInfo, destChainInfo) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && ((0, _utils._isPureEvmChain)(originChainInfo) || (0, _utils._isPureEvmChain)(destChainInfo));
 }
+function _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) {
+  return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
+}
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -209,7 +218,7 @@ function _getAssetIdentifier(tokenInfo, version) {
   if (!_assetIdentifier) {
     throw new Error('Asset must have multilocation');
   }
-  const assetIdentifier = ['statemint-LOCAL-KSM'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
+  const assetIdentifier = ['statemint-LOCAL-KSM', 'statemine-LOCAL-DOT'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
   ? _assetIdentifier : _adaptX1Interior(structuredClone(_assetIdentifier), version);
   return version >= 4 // from V4, Concrete is removed
   ? assetIdentifier : {

package/cjs/koni/background/handlers/Extension.js

@@ -1770,11 +1770,11 @@ class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    const isFromSnowBridgeXcm = (0, _utils3._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = (0, _utils3._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
-      if (isFromSnowBridgeXcm) {
+      if (isSnowBridgeEvmTransfer) {
         const evmApi = this.#koniState.getEvmApi(originNetworkKey);
         extrinsic = await (0, _xcm.createSnowBridgeExtrinsic)({
           destinationTokenInfo,
@@ -1844,7 +1844,7 @@ class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
-      chainType: !isFromSnowBridgeXcm ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
       transferNativeAmount: (0, _utils3._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,
@@ -2003,8 +2003,9 @@ class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
+    const existentialDeposit = originTokenInfo.minAmount || '0';
     if (destinationTokenInfo) {
-      const [bnMockFee, {
+      const [bnMockExecutionFee, {
         value
       }] = await Promise.all([(0, _xcm.getXcmMockTxFee)(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
@@ -2013,8 +2014,7 @@ class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new _bignumber.default(value);
-      const estimatedFee = bnMockFee.multipliedBy(_constants.XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
-
+      const estimatedFee = bnMockExecutionFee.multipliedBy(_constants.XCM_FEE_RATIO).plus(new _bignumber.default(existentialDeposit));
       return bnMaxTransferable.minus(estimatedFee);
     }
     return new _bignumber.default(0);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.28-0'
+  version: '1.2.30-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/index.js

@@ -78,6 +78,21 @@ const filterAddress = (addresses, chainInfo) => {
     return [fetchList, [...unfetchList, ...evmAddresses]];
   }
 };
+const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
+  const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT]);
+  const now = new Date().getTime();
+  Object.values(tokens).forEach(token => {
+    const items = addresses.map(address => ({
+      address,
+      tokenSlug: token.slug,
+      free: '0',
+      locked: '0',
+      state,
+      timestamp: now
+    }));
+    callback(items);
+  });
+};
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
 function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback, extrinsicType) {
@@ -96,19 +111,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT]);
-      const now = new Date().getTime();
-      Object.values(tokens).forEach(token => {
-        const items = notSupportAddresses.map(address => ({
-          address,
-          tokenSlug: token.slug,
-          free: '0',
-          locked: '0',
-          state: _KoniTypes.APIItemState.NOT_SUPPORT,
-          timestamp: now
-        }));
-        callback(items);
-      });
+      handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.NOT_SUPPORT, callback);
     }
     const evmApi = evmApiMap[chainSlug];
     if ((0, _utils._isPureEvmChain)(chainInfo)) {
@@ -121,6 +124,9 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
       });
     }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
+    if (!substrateApi.isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.PENDING, callback);
+    }
     return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });
   return () => {

package/cjs/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -23,7 +23,8 @@ const subscribeGRC20Balance = _ref => {
     chainInfo,
     substrateApi
   } = _ref;
-  if (!(substrateApi instanceof _api.GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof _api.GearApi)) {
     console.warn('Cannot subscribe GRC20 balance without GearApi instance');
     return _util.noop;
   }
@@ -32,7 +33,7 @@ const subscribeGRC20Balance = _ref => {
   const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
   Object.entries(tokenList).forEach(_ref2 => {
     let [slug, tokenInfo] = _ref2;
-    grc20ContractMap[slug] = (0, _utils2.getGRC20ContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+    grc20ContractMap[slug] = (0, _utils2.getGRC20ContractPromise)(apiPromise, (0, _utils._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
@@ -82,7 +83,8 @@ const subscribeVftBalance = _ref3 => {
     chainInfo,
     substrateApi
   } = _ref3;
-  if (!(substrateApi instanceof _api.GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof _api.GearApi)) {
     console.warn('Cannot subscribe VFT balance without GearApi instance');
     return _util.noop;
   }
@@ -91,7 +93,7 @@ const subscribeVftBalance = _ref3 => {
   const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.VFT]);
   Object.entries(tokenList).forEach(_ref4 => {
     let [slug, tokenInfo] = _ref4;
-    vftContractMap[slug] = (0, _utils2.getVFTContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+    vftContractMap[slug] = (0, _utils2.getVFTContractPromise)(apiPromise, (0, _utils._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -114,7 +114,6 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
 // eslint-disable-next-line @typescript-eslint/require-await
 exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
 const subscribeWithSystemAccountPallet = async _ref => {
-  var _substrateApi$api$tx, _substrateApi$api$tx$;
   let {
     addresses,
     callback,
@@ -124,7 +123,7 @@ const subscribeWithSystemAccountPallet = async _ref => {
   } = _ref;
   const systemAccountKey = 'query_system_account';
   const poolMembersKey = 'query_nominationPools_poolMembers';
-  const isNominationPoolMigrated = !!((_substrateApi$api$tx = substrateApi.api.tx) !== null && _substrateApi$api$tx !== void 0 && (_substrateApi$api$tx$ = _substrateApi$api$tx.nominationPools) !== null && _substrateApi$api$tx$ !== void 0 && _substrateApi$api$tx$.migrateDelegation);
+  const isNominationPoolMigrated = await checkNominationPoolCompleteMigrated(substrateApi);
   const params = [{
     section: 'query',
     module: systemAccountKey.split('_')[1],
@@ -167,6 +166,19 @@ const subscribeWithSystemAccountPallet = async _ref => {
     subscription.unsubscribe();
   };
 };
+const checkNominationPoolCompleteMigrated = async substrateApi => {
+  if (!substrateApi.api.tx.nominationPools || !substrateApi.api.query.staking) {
+    return false;
+  }
+  const isNominationPoolMigrated = !!substrateApi.api.tx.nominationPools.migrateDelegation && !!substrateApi.api.query.staking.counterForVirtualStakers && !!substrateApi.api.query.staking.virtualStakers;
+  if (!isNominationPoolMigrated) {
+    return false;
+  }
+  const [nominationPoolCounterRaw, nominationPoolInfoRaw] = await Promise.all([substrateApi.api.query.staking.counterForVirtualStakers(), substrateApi.api.query.staking.virtualStakers.entries()]);
+  const nominationPoolCounter = nominationPoolCounterRaw.toPrimitive();
+  const nominationPoolInfoLength = nominationPoolInfoRaw.length;
+  return nominationPoolCounter !== 0 && nominationPoolInfoLength !== 0;
+};
 const subscribeForeignAssetBalance = async _ref2 => {
   let {
     addresses,

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -49,19 +49,14 @@ const createXcmExtrinsic = async _ref2 => {
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  let extrinsic;
-  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain)) {
-    if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils._isNativeToken)(originTokenInfo)) {
-      extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    } else {
-      extrinsic = (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    }
-  } else if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    extrinsic = (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-  } else {
-    extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && (0, _utils._isNativeToken)(originTokenInfo);
+  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+    return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  return extrinsic;
+  if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+    return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  }
+  return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;
 const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
@@ -69,7 +64,7 @@ const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, dest
     var _paymentInfo$partialF;
     const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
     const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap';
+    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
 
     // mock receiving account from sender
     const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(destChainInfo) && !(0, _utils._isChainEvmCompatible)(originChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;

package/cjs/services/chain-service/constants.js

@@ -283,7 +283,8 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcmSpecialCases: ['astar', 'shiden'],
   xcmPallet: ['polkadot', 'kusama', 'rococo']
   // default is xTokens pallet
 };

package/cjs/services/earning-service/handlers/lending/interlay.js

@@ -61,7 +61,6 @@ class InterlayLendingPoolHandler extends _base.default {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: 1.29,
           exchangeRate: exchangeRate / decimals
         }],
         maxCandidatePerFarmer: 1,
@@ -71,7 +70,6 @@ class InterlayLendingPoolHandler extends _base.default {
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: 1.29,
         tvl: '291890000000000'
       }
     };

package/cjs/services/earning-service/handlers/liquid-staking/parallel.js

@@ -46,7 +46,7 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
 
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_exchangeRate, _currentBlockHeader, _currentTimestamp, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.rpc.chain.getHeader(), substrateApi.api.query.timestamp.now(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
+    const [_exchangeRate, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
     let tvl = _util.BN_ZERO;
     for (const _stakingLedger of _stakingLedgers) {
       const _ledger = _stakingLedger[1];
@@ -54,16 +54,7 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
       tvl = tvl.add(new _util.BN(ledger.total.toString()));
     }
     const exchangeRate = _exchangeRate.toPrimitive();
-    const currentBlockHeader = _currentBlockHeader.toPrimitive();
-    const currentTimestamp = _currentTimestamp.toPrimitive();
-    const beginBlock = currentBlockHeader.number - 24 * 60 * 60 / 6 * 14;
-    const _beginBlockHash = await substrateApi.api.rpc.chain.getBlockHash(beginBlock);
-    const beginBlockHash = _beginBlockHash.toString();
-    const [_beginTimestamp, _beginExchangeRate] = await Promise.all([substrateApi.api.query.timestamp.now.at(beginBlockHash), substrateApi.api.query.liquidStaking.exchangeRate.at(beginBlockHash)]);
-    const beginTimestamp = _beginTimestamp.toPrimitive();
-    const beginExchangeRate = _beginExchangeRate.toPrimitive();
     const decimals = 10 ** this.rateDecimals;
-    const apy = (exchangeRate / beginExchangeRate) ** (365 * 24 * 60 * 60000 / (currentTimestamp - beginTimestamp)) - 1;
     const minStake = substrateApi.api.consts.liquidStaking.minStake.toString();
     const minUnstake = substrateApi.api.consts.liquidStaking.minUnstake.toString();
     this.updateExchangeRate(exchangeRate);
@@ -77,7 +68,6 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
         unstakingPeriod: 24 * 28,
@@ -88,7 +78,6 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
           defaultUnstake: minUnstake,
           fastUnstake: '0'
         },
-        totalApy: apy * 100,
         tvl: tvl.toString()
       }
     };

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -14,8 +14,8 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,8 +13,8 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/cjs/services/migration-service/scripts/index.js

@@ -61,8 +61,8 @@ var _default = {
   '1.1.33-01': _MigrateLedgerAccountV.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
-  '1.1.69-03': _MigrateAssetSetting.default,
-  '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.2.28-01': _MigrateAssetSetting.default,
+  '1.2.28-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
   '1.2.14-01': _ClearMetadataDatabase.default

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChainflipSwapHandler = void 0;
+exports.ChainflipSwapHandler = exports.CHAINFLIP_BROKER_API = void 0;
 var _swap = require("@chainflip/sdk/swap");
 var _chainList = require("@subwallet/chain-list");
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
@@ -26,10 +26,13 @@ var ChainflipFeeType;
   ChainflipFeeType["INGRESS"] = "INGRESS";
   ChainflipFeeType["NETWORK"] = "NETWORK";
   ChainflipFeeType["EGRESS"] = "EGRESS";
-  ChainflipFeeType["LIQUIDITY"] = "LIQUIDITY";
+  ChainflipFeeType["BOOST"] = "BOOST";
+  ChainflipFeeType["BROKER"] = "BROKER";
 })(ChainflipFeeType || (ChainflipFeeType = {}));
 const INTERMEDIARY_MAINNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_SEPOLIA;
+const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
+exports.CHAINFLIP_BROKER_API = CHAINFLIP_BROKER_API;
 var CHAINFLIP_QUOTE_ERROR;
 (function (CHAINFLIP_QUOTE_ERROR) {
   CHAINFLIP_QUOTE_ERROR["InsufficientLiquidity"] = "InsufficientLiquidity";
@@ -47,9 +50,9 @@ class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? _swap3.SwapProviderId.CHAIN_FLIP_TESTNET : _swap3.SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.swapSdk = new _swap.SwapSDK({
-      network: isTestnet ? 'perseverance' : 'mainnet'
-    });
+
+    // @ts-ignore
+    this.swapSdk = new _swap.SwapSDK((0, _utils2.getChainflipOptions)(isTestnet));
   }
   get chainService() {
     return this.swapBaseHandler.chainService;
@@ -235,7 +238,10 @@ class ChainflipSwapHandler {
           case ChainflipFeeType.NETWORK:
 
           // eslint-disable-next-line no-fallthrough
-          case ChainflipFeeType.LIQUIDITY:
+          case ChainflipFeeType.BOOST:
+
+          // eslint-disable-next-line no-fallthrough
+          case ChainflipFeeType.BROKER:
             {
               const tokenSlug = Object.keys(this.assetMapping).find(assetSlug => this.assetMapping[assetSlug] === fee.asset);
               feeComponent.push({

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

@@ -256,7 +256,7 @@ class HydradxHandler {
 
         switch (defaultError) {
           case _sdk.PoolError.InsufficientTradingAmount:
-            return new _SwapError.SwapError(_swap2.SwapErrorType.SWAP_NOT_ENOUGH_BALANCE);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.NOT_MEET_MIN_SWAP);
           case _sdk.PoolError.TradeNotAllowed:
             return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
           case _sdk.PoolError.MaxInRatioExceeded:

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

@@ -7,11 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.calculateSwapRate = calculateSwapRate;
 exports.convertSwapRate = convertSwapRate;
+exports.getChainflipBroker = getChainflipBroker;
+exports.getChainflipOptions = getChainflipOptions;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
 var _swap = require("@chainflip/sdk/swap");
 var _chainList = require("@subwallet/chain-list");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
 var _swap2 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -79,4 +82,30 @@ function convertSwapRate(rate, fromAsset, toAsset) {
   const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
   const bnRate = new _bignumber.default(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
+}
+function getChainflipOptions(isTestnet) {
+  if (isTestnet) {
+    return {
+      network: getChainflipNetwork(isTestnet)
+    };
+  }
+  return {
+    network: getChainflipNetwork(isTestnet),
+    broker: getChainflipBroker(isTestnet)
+  };
+}
+function getChainflipNetwork(isTestnet) {
+  return isTestnet ? 'perseverance' : 'mainnet';
+}
+function getChainflipBroker(isTestnet) {
+  // noted: currently not use testnet broker
+  if (isTestnet) {
+    return {
+      url: `https://perseverance.chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
+    };
+  } else {
+    return {
+      url: `https://chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
+    };
+  }
 }

package/core/substrate/xcm-parser.d.ts

@@ -47,8 +47,9 @@ export declare function _getXcmMultiLocation(originChainInfo: _ChainInfo, destCh
         interior: unknown;
     };
 };
-export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
-export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): string;
+export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
+export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
+export declare function _isMythosFromHydrationToMythos(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
 export declare function _adaptX1Interior(assetIdentifier: Record<string, any>, version: number): Record<string, any>;

package/core/substrate/xcm-parser.js

@@ -46,8 +46,8 @@ export function _getXcmMultiLocation(originChainInfo, destChainInfo, version, re
     }
   };
 }
-export function _isXcmTransferUnstable(originChainInfo, destChainInfo) {
-  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo);
+export function _isXcmTransferUnstable(originChainInfo, destChainInfo, assetSlug) {
+  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) || _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug);
 }
 function getAssetHubBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
@@ -62,16 +62,21 @@ function getAssetHubBridgeUnstableWarning(originChainInfo) {
 function getSnowBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
     case COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 70$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $70 and takes up to 1 hour to complete. Continue at your own risk';
     case COMMON_CHAIN_SLUGS.ETHEREUM:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 5$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $5 and takes up to 1 hour to complete. Continue at your own risk';
     default:
       return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a high fee and takes up to 1 hour to complete. Continue at your own risk';
   }
 }
-export function _getXcmUnstableWarning(originChainInfo, destChainInfo) {
+function getMythosFromHydrationToMythosWarning() {
+  return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
+}
+export function _getXcmUnstableWarning(originChainInfo, destChainInfo, assetSlug) {
   if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
+  } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
+    return getMythosFromHydrationToMythosWarning();
   } else {
     return getAssetHubBridgeUnstableWarning(originChainInfo);
   }
@@ -82,6 +87,9 @@ export function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
 export function _isSnowBridgeXcm(originChainInfo, destChainInfo) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && (_isPureEvmChain(originChainInfo) || _isPureEvmChain(destChainInfo));
 }
+export function _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) {
+  return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
+}
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -195,7 +203,7 @@ function _getAssetIdentifier(tokenInfo, version) {
   if (!_assetIdentifier) {
     throw new Error('Asset must have multilocation');
   }
-  const assetIdentifier = ['statemint-LOCAL-KSM'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
+  const assetIdentifier = ['statemint-LOCAL-KSM', 'statemine-LOCAL-DOT'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
   ? _assetIdentifier : _adaptX1Interior(structuredClone(_assetIdentifier), version);
   return version >= 4 // from V4, Concrete is removed
   ? assetIdentifier : {

package/koni/background/handlers/Extension.js

@@ -1711,11 +1711,11 @@ export default class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    const isFromSnowBridgeXcm = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
-      if (isFromSnowBridgeXcm) {
+      if (isSnowBridgeEvmTransfer) {
         const evmApi = this.#koniState.getEvmApi(originNetworkKey);
         extrinsic = await createSnowBridgeExtrinsic({
           destinationTokenInfo,
@@ -1785,7 +1785,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
-      chainType: !isFromSnowBridgeXcm ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,
@@ -1940,8 +1940,9 @@ export default class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
+    const existentialDeposit = originTokenInfo.minAmount || '0';
     if (destinationTokenInfo) {
-      const [bnMockFee, {
+      const [bnMockExecutionFee, {
         value
       }] = await Promise.all([getXcmMockTxFee(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: ExtrinsicType.TRANSFER_XCM,
@@ -1950,8 +1951,7 @@ export default class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new BigN(value);
-      const estimatedFee = bnMockFee.multipliedBy(XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
-
+      const estimatedFee = bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
       return bnMaxTransferable.minus(estimatedFee);
     }
     return new BigN(0);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.28-0",
+  "version": "1.2.30-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2038,12 +2038,12 @@
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
-    "@chainflip/sdk": "^1.3.0",
+    "@chainflip/sdk": "^1.5.2",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^2.1.0",
+    "@galacticcouncil/sdk": "^4.2.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
@@ -2070,11 +2070,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.84",
-    "@subwallet/extension-base": "^1.2.28-0",
-    "@subwallet/extension-chains": "^1.2.28-0",
-    "@subwallet/extension-dapp": "^1.2.28-0",
-    "@subwallet/extension-inject": "^1.2.28-0",
+    "@subwallet/chain-list": "0.2.87",
+    "@subwallet/extension-base": "^1.2.30-0",
+    "@subwallet/extension-chains": "^1.2.30-0",
+    "@subwallet/extension-dapp": "^1.2.30-0",
+    "@subwallet/extension-inject": "^1.2.30-0",
     "@subwallet/keyring": "^0.1.6",
     "@subwallet/ui-keyring": "^0.1.6",
     "@walletconnect/keyvaluestorage": "^1.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.28-0'
+  version: '1.2.30-0'
 };

package/services/balance-service/helpers/subscribe/index.js

@@ -70,6 +70,21 @@ const filterAddress = (addresses, chainInfo) => {
     return [fetchList, [...unfetchList, ...evmAddresses]];
   }
 };
+const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
+  const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT]);
+  const now = new Date().getTime();
+  Object.values(tokens).forEach(token => {
+    const items = addresses.map(address => ({
+      address,
+      tokenSlug: token.slug,
+      free: '0',
+      locked: '0',
+      state,
+      timestamp: now
+    }));
+    callback(items);
+  });
+};
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
 export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback, extrinsicType) {
@@ -82,19 +97,7 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT]);
-      const now = new Date().getTime();
-      Object.values(tokens).forEach(token => {
-        const items = notSupportAddresses.map(address => ({
-          address,
-          tokenSlug: token.slug,
-          free: '0',
-          locked: '0',
-          state: APIItemState.NOT_SUPPORT,
-          timestamp: now
-        }));
-        callback(items);
-      });
+      handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, APIItemState.NOT_SUPPORT, callback);
     }
     const evmApi = evmApiMap[chainSlug];
     if (_isPureEvmChain(chainInfo)) {
@@ -107,6 +110,9 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
       });
     }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
+    if (!substrateApi.isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, APIItemState.PENDING, callback);
+    }
     return subscribeSubstrateBalance(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });
   return () => {

package/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -16,7 +16,8 @@ export const subscribeGRC20Balance = ({
   chainInfo,
   substrateApi
 }) => {
-  if (!(substrateApi instanceof GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof GearApi)) {
     console.warn('Cannot subscribe GRC20 balance without GearApi instance');
     return noop;
   }
@@ -24,7 +25,7 @@ export const subscribeGRC20Balance = ({
   const grc20ContractMap = {};
   const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.GRC20]);
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    grc20ContractMap[slug] = getGRC20ContractPromise(substrateApi, _getContractAddressOfToken(tokenInfo));
+    grc20ContractMap[slug] = getGRC20ContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
@@ -72,7 +73,8 @@ export const subscribeVftBalance = ({
   chainInfo,
   substrateApi
 }) => {
-  if (!(substrateApi instanceof GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof GearApi)) {
     console.warn('Cannot subscribe VFT balance without GearApi instance');
     return noop;
   }
@@ -80,7 +82,7 @@ export const subscribeVftBalance = ({
   const vftContractMap = {};
   const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.VFT]);
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    vftContractMap[slug] = getVFTContractPromise(substrateApi, _getContractAddressOfToken(tokenInfo));
+    vftContractMap[slug] = getVFTContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -112,10 +112,9 @@ const subscribeWithSystemAccountPallet = async ({
   extrinsicType,
   substrateApi
 }) => {
-  var _substrateApi$api$tx, _substrateApi$api$tx$;
   const systemAccountKey = 'query_system_account';
   const poolMembersKey = 'query_nominationPools_poolMembers';
-  const isNominationPoolMigrated = !!((_substrateApi$api$tx = substrateApi.api.tx) !== null && _substrateApi$api$tx !== void 0 && (_substrateApi$api$tx$ = _substrateApi$api$tx.nominationPools) !== null && _substrateApi$api$tx$ !== void 0 && _substrateApi$api$tx$.migrateDelegation);
+  const isNominationPoolMigrated = await checkNominationPoolCompleteMigrated(substrateApi);
   const params = [{
     section: 'query',
     module: systemAccountKey.split('_')[1],
@@ -158,6 +157,19 @@ const subscribeWithSystemAccountPallet = async ({
     subscription.unsubscribe();
   };
 };
+const checkNominationPoolCompleteMigrated = async substrateApi => {
+  if (!substrateApi.api.tx.nominationPools || !substrateApi.api.query.staking) {
+    return false;
+  }
+  const isNominationPoolMigrated = !!substrateApi.api.tx.nominationPools.migrateDelegation && !!substrateApi.api.query.staking.counterForVirtualStakers && !!substrateApi.api.query.staking.virtualStakers;
+  if (!isNominationPoolMigrated) {
+    return false;
+  }
+  const [nominationPoolCounterRaw, nominationPoolInfoRaw] = await Promise.all([substrateApi.api.query.staking.counterForVirtualStakers(), substrateApi.api.query.staking.virtualStakers.entries()]);
+  const nominationPoolCounter = nominationPoolCounterRaw.toPrimitive();
+  const nominationPoolInfoLength = nominationPoolInfoRaw.length;
+  return nominationPoolCounter !== 0 && nominationPoolInfoLength !== 0;
+};
 const subscribeForeignAssetBalance = async ({
   addresses,
   assetMap,

package/services/balance-service/transfer/xcm/index.js

@@ -39,26 +39,21 @@ export const createXcmExtrinsic = async ({
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  let extrinsic;
-  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain)) {
-    if (['astar', 'shiden'].includes(originChainInfo.slug) && !_isNativeToken(originTokenInfo)) {
-      extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    } else {
-      extrinsic = getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    }
-  } else if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    extrinsic = getExtrinsicByXcmPalletPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-  } else {
-    extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && _isNativeToken(originTokenInfo);
+  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  return extrinsic;
+  if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  }
+  return getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
 export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
   try {
     var _paymentInfo$partialF;
     const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
     const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap';
+    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
 
     // mock receiving account from sender
     const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(destChainInfo) && !_isChainEvmCompatible(originChainInfo) ? u8aToHex(addressToEvm(address)) : address;

package/services/chain-service/constants.d.ts

@@ -76,6 +76,7 @@ export declare const _ZK_ASSET_PREFIX = "zk";
 export declare const _DEFAULT_MANTA_ZK_CHAIN = "calamari";
 export declare const _XCM_CHAIN_GROUP: {
     polkadotXcm: string[];
+    polkadotXcmSpecialCases: string[];
     xcmPallet: string[];
 };
 export declare const _XCM_TYPE: {

package/services/chain-service/constants.js

@@ -261,7 +261,8 @@ export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 
 export const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcmSpecialCases: ['astar', 'shiden'],
   xcmPallet: ['polkadot', 'kusama', 'rococo']
   // default is xTokens pallet
 };

package/services/earning-service/handlers/lending/interlay.js

@@ -54,7 +54,6 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: 1.29,
           exchangeRate: exchangeRate / decimals
         }],
         maxCandidatePerFarmer: 1,
@@ -64,7 +63,6 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: 1.29,
         tvl: '291890000000000'
       }
     };

package/services/earning-service/handlers/liquid-staking/parallel.js

@@ -39,7 +39,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
 
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_exchangeRate, _currentBlockHeader, _currentTimestamp, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.rpc.chain.getHeader(), substrateApi.api.query.timestamp.now(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
+    const [_exchangeRate, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
     let tvl = BN_ZERO;
     for (const _stakingLedger of _stakingLedgers) {
       const _ledger = _stakingLedger[1];
@@ -47,16 +47,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
       tvl = tvl.add(new BN(ledger.total.toString()));
     }
     const exchangeRate = _exchangeRate.toPrimitive();
-    const currentBlockHeader = _currentBlockHeader.toPrimitive();
-    const currentTimestamp = _currentTimestamp.toPrimitive();
-    const beginBlock = currentBlockHeader.number - 24 * 60 * 60 / 6 * 14;
-    const _beginBlockHash = await substrateApi.api.rpc.chain.getBlockHash(beginBlock);
-    const beginBlockHash = _beginBlockHash.toString();
-    const [_beginTimestamp, _beginExchangeRate] = await Promise.all([substrateApi.api.query.timestamp.now.at(beginBlockHash), substrateApi.api.query.liquidStaking.exchangeRate.at(beginBlockHash)]);
-    const beginTimestamp = _beginTimestamp.toPrimitive();
-    const beginExchangeRate = _beginExchangeRate.toPrimitive();
     const decimals = 10 ** this.rateDecimals;
-    const apy = (exchangeRate / beginExchangeRate) ** (365 * 24 * 60 * 60000 / (currentTimestamp - beginTimestamp)) - 1;
     const minStake = substrateApi.api.consts.liquidStaking.minStake.toString();
     const minUnstake = substrateApi.api.consts.liquidStaking.minUnstake.toString();
     this.updateExchangeRate(exchangeRate);
@@ -70,7 +61,6 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
         unstakingPeriod: 24 * 28,
@@ -81,7 +71,6 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
           defaultUnstake: minUnstake,
           fastUnstake: '0'
         },
-        totalApy: apy * 100,
         tvl: tvl.toString()
       }
     };

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -7,8 +7,8 @@ export default class MigrateTransactionHistoryBySymbol extends BaseMigrationJob
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async ([oldSlug, newSlug], i) => {

package/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -6,8 +6,8 @@ export default class MigrateAssetSetting extends BaseMigrationJob {
   async run() {
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/services/migration-service/scripts/index.js

@@ -53,8 +53,8 @@ export default {
   '1.1.33-01': MigrateLedgerAccountV2,
   '1.1.41-01': DeleteChainStaking,
   '1.1.46-01': AutoEnableSomeTokens,
-  '1.1.69-03': MigrateAssetSetting,
-  '1.1.69-02': MigrateTransactionHistoryBySymbol,
+  '1.2.28-01': MigrateAssetSetting,
+  '1.2.28-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
   '1.2.13-01': ReloadMetadata,
   '1.2.14-01': ClearMetadataDatabase

package/services/swap-service/handler/chainflip-handler.d.ts

@@ -6,6 +6,7 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
 import { OptimalSwapPathParams, SwapEarlyValidation, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+export declare const CHAINFLIP_BROKER_API: string;
 export declare class ChainflipSwapHandler implements SwapBaseInterface {
     private swapSdk;
     private readonly isTestnet;
@@ -17,8 +18,8 @@ export declare class ChainflipSwapHandler implements SwapBaseInterface {
     get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
     get name(): string;
     get slug(): string;
-    get assetMapping(): Record<string, import("@chainflip/sdk/dist/contracts-b0BB7B5m").A>;
-    get chainMapping(): Record<string, import("@chainflip/sdk/dist/contracts-b0BB7B5m").C>;
+    get assetMapping(): Record<string, import("@chainflip/sdk/dist/contracts-Cb-5VdIi").a>;
+    get chainMapping(): Record<string, import("@chainflip/sdk/dist/contracts-Cb-5VdIi").C>;
     get intermediaryAssetSlug(): COMMON_ASSETS.USDC_ETHEREUM | COMMON_ASSETS.USDC_SEPOLIA;
     validateSwapRequest(request: SwapRequest): Promise<SwapEarlyValidation>;
     private parseSwapPath;

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

@@ -11,7 +11,7 @@ import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/e
 import { createTransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { _getAssetDecimals, _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken, _isSubstrateChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
-import { calculateSwapRate, CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { calculateSwapRate, CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING, getChainflipOptions, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
 import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';
@@ -20,10 +20,12 @@ var ChainflipFeeType;
   ChainflipFeeType["INGRESS"] = "INGRESS";
   ChainflipFeeType["NETWORK"] = "NETWORK";
   ChainflipFeeType["EGRESS"] = "EGRESS";
-  ChainflipFeeType["LIQUIDITY"] = "LIQUIDITY";
+  ChainflipFeeType["BOOST"] = "BOOST";
+  ChainflipFeeType["BROKER"] = "BROKER";
 })(ChainflipFeeType || (ChainflipFeeType = {}));
 const INTERMEDIARY_MAINNET_ASSET_SLUG = COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = COMMON_ASSETS.USDC_SEPOLIA;
+export const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
 var CHAINFLIP_QUOTE_ERROR;
 (function (CHAINFLIP_QUOTE_ERROR) {
   CHAINFLIP_QUOTE_ERROR["InsufficientLiquidity"] = "InsufficientLiquidity";
@@ -40,9 +42,9 @@ export class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? SwapProviderId.CHAIN_FLIP_TESTNET : SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.swapSdk = new SwapSDK({
-      network: isTestnet ? 'perseverance' : 'mainnet'
-    });
+
+    // @ts-ignore
+    this.swapSdk = new SwapSDK(getChainflipOptions(isTestnet));
   }
   get chainService() {
     return this.swapBaseHandler.chainService;
@@ -228,7 +230,10 @@ export class ChainflipSwapHandler {
           case ChainflipFeeType.NETWORK:
 
           // eslint-disable-next-line no-fallthrough
-          case ChainflipFeeType.LIQUIDITY:
+          case ChainflipFeeType.BOOST:
+
+          // eslint-disable-next-line no-fallthrough
+          case ChainflipFeeType.BROKER:
             {
               const tokenSlug = Object.keys(this.assetMapping).find(assetSlug => this.assetMapping[assetSlug] === fee.asset);
               feeComponent.push({

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

@@ -248,7 +248,7 @@ export class HydradxHandler {
 
         switch (defaultError) {
           case PoolError.InsufficientTradingAmount:
-            return new SwapError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE);
+            return new SwapError(SwapErrorType.NOT_MEET_MIN_SWAP);
           case PoolError.TradeNotAllowed:
             return new SwapError(SwapErrorType.ERROR_FETCHING_QUOTE);
           case PoolError.MaxInRatioExceeded:

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

@@ -13,3 +13,15 @@ export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | un
 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 getChainflipOptions(isTestnet: boolean): {
+    network: string;
+    broker?: undefined;
+} | {
+    network: string;
+    broker: {
+        url: string;
+    };
+};
+export declare function getChainflipBroker(isTestnet: boolean): {
+    url: string;
+};

package/services/swap-service/utils.js

@@ -4,6 +4,7 @@
 import { Assets, Chains } from '@chainflip/sdk/swap';
 import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
+import { CHAINFLIP_BROKER_API } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
@@ -60,4 +61,30 @@ export function convertSwapRate(rate, fromAsset, toAsset) {
   const decimalDiff = _getAssetDecimals(toAsset) - _getAssetDecimals(fromAsset);
   const bnRate = new BigN(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
+}
+export function getChainflipOptions(isTestnet) {
+  if (isTestnet) {
+    return {
+      network: getChainflipNetwork(isTestnet)
+    };
+  }
+  return {
+    network: getChainflipNetwork(isTestnet),
+    broker: getChainflipBroker(isTestnet)
+  };
+}
+function getChainflipNetwork(isTestnet) {
+  return isTestnet ? 'perseverance' : 'mainnet';
+}
+export function getChainflipBroker(isTestnet) {
+  // 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}`
+    };
+  }
 }