@subwallet/extension-base 1.2.3-0 → 1.2.3-1

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.3-0'
+  version: '1.2.3-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/group.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.groupBalance = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _utils = require("@subwallet/extension-base/utils");
-var _bn = _interopRequireDefault(require("bn.js"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -20,34 +19,12 @@ var _bn = _interopRequireDefault(require("bn.js"));
  */
 const groupBalance = (items, address, token) => {
   const states = items.map(item => item.state);
-  const result = {
+  return {
     address,
     tokenSlug: token,
-    free: (0, _utils.sumBN)(items.map(item => new _bn.default(item.free))).toString(),
-    locked: (0, _utils.sumBN)(items.map(item => new _bn.default(item.locked))).toString(),
+    free: _bignumber.default.sum.apply(null, items.map(item => item.free)).toFixed(),
+    locked: _bignumber.default.sum.apply(null, items.map(item => item.locked)).toFixed(),
     state: states.every(item => item === _KoniTypes.APIItemState.NOT_SUPPORT) ? _KoniTypes.APIItemState.NOT_SUPPORT : states.some(item => item === _KoniTypes.APIItemState.READY) ? _KoniTypes.APIItemState.READY : _KoniTypes.APIItemState.PENDING
   };
-  for (const item of items) {
-    if (item.substrateInfo) {
-      if (!result.substrateInfo) {
-        result.substrateInfo = {
-          ...item.substrateInfo
-        };
-      } else {
-        const old = {
-          ...result.substrateInfo
-        };
-        const _new = {
-          ...item.substrateInfo
-        };
-        result.substrateInfo = {
-          reserved: new _bn.default(old.reserved || '0').add(new _bn.default(_new.reserved || '0')).toString(),
-          feeFrozen: new _bn.default(old.feeFrozen || '0').add(new _bn.default(_new.feeFrozen || '0')).toString(),
-          miscFrozen: new _bn.default(old.miscFrozen || '0').add(new _bn.default(_new.miscFrozen || '0')).toString()
-        };
-      }
-    }
-  }
-  return result;
 };
 exports.groupBalance = groupBalance;

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

@@ -75,18 +75,8 @@ const filterAddress = (addresses, chainInfo) => {
   }
 };
 
-// interface SubscribeBlanceOptions {
-//   addresses: string[];
-//   chains: string[];
-//   tokens: string[];
-//   chainInfoMap: Record<string, _ChainInfo>;
-//   substrateApiMap: Record<string, _SubstrateApi>;
-//   evmApiMap: Record<string, _EvmApi>;
-//   callback: (rs: BalanceItem[]) => void;
-// }
-
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
-function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback) {
+function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback, extrinsicType) {
   // Filter chain and token
   const chainAssetMap = Object.fromEntries(Object.entries(_chainAssetMap).filter(_ref => {
     let [token] = _ref;
@@ -126,26 +116,8 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
         evmApi
       });
     }
-
-    // if (!useAddresses || useAddresses.length === 0 || _PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
-    //   const fungibleTokensByChain = state.chainService.getFungibleTokensByChain(chainSlug, true);
-    //   const now = new Date().getTime();
-    //
-    //   Object.values(fungibleTokensByChain).map((token) => {
-    //     return {
-    //       tokenSlug: token.slug,
-    //       free: '0',
-    //       locked: '0',
-    //       state: APIItemState.READY,
-    //       timestamp: now
-    //     } as BalanceItem;
-    //   }).forEach(callback);
-    //
-    //   return undefined;
-    // }
-
     const substrateApi = await substrateApiMap[chainSlug].isReady;
-    return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback);
+    return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });
   return () => {
     unsubList.forEach(subProm => {

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

@@ -9,6 +9,8 @@ var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
+var _nominationpoolsPallet = require("@subwallet/extension-base/core/substrate/nominationpools-pallet");
+var _systemPallet = require("@subwallet/extension-base/core/substrate/system-pallet");
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
@@ -23,7 +25,7 @@ var _equilibrium = require("./equilibrium");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback) => {
+const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback, extrinsicType) => {
   let unsubNativeToken;
   let unsubLocalToken;
   let unsubEvmContractToken;
@@ -35,7 +37,8 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
     addresses,
     chainInfo,
     assetMap,
-    callback
+    callback,
+    extrinsicType
   };
   const substrateParams = {
     ...baseParams,
@@ -107,11 +110,13 @@ const subscribeWithSystemAccountPallet = async _ref => {
     addresses,
     callback,
     chainInfo,
+    extrinsicType,
     substrateApi
   } = _ref;
   const chainNativeTokenSlug = (0, _utils2._getChainNativeTokenSlug)(chainInfo);
   const balanceSubscribe = substrateApi.rx.query.system.account.multi(addresses);
-  let poolSubscribe;
+  let poolSubscribe; // add points in nomination pool back to user's balance
+
   if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && substrateApi.query.nominationPools) {
     var _substrateApi$rx$quer;
     poolSubscribe = (_substrateApi$rx$quer = substrateApi.rx.query.nominationPools.poolMembers) === null || _substrateApi$rx$quer === void 0 ? void 0 : _substrateApi$rx$quer.multi(addresses);
@@ -127,54 +132,26 @@ const subscribeWithSystemAccountPallet = async _ref => {
   }
   const subscription = (0, _rxjs.combineLatest)({
     balances: balanceSubscribe,
-    pools: poolSubscribe
+    poolMemberInfos: poolSubscribe
   }).subscribe(_ref2 => {
     let {
-      balances: _balances,
-      pools: poolMemberDatas
+      balances,
+      poolMemberInfos
     } = _ref2;
-    const balances = _balances;
-    const pooledStakingBalances = [];
-    for (const _poolMemberData of poolMemberDatas) {
-      const poolMemberData = _poolMemberData.toPrimitive();
-      if (poolMemberData) {
-        let pooled = new _util.BN(poolMemberData.points.toString());
-        Object.entries(poolMemberData.unbondingEras).forEach(_ref3 => {
-          let [, amount] = _ref3;
-          pooled = pooled.add(new _util.BN(amount));
-        });
-        pooledStakingBalances.push(pooled);
-      } else {
-        pooledStakingBalances.push(_util.BN_ZERO);
-      }
-    }
-    const items = balances.map((balance, index) => {
-      var _balance$data, _balance$data$free, _balance$data2, _balance$data2$reserv, _balance$data3, _balance$data3$miscFr, _balance$data4, _balance$data4$frozen, _balance$data5, _balance$data5$feeFro;
-      let total = ((_balance$data = balance.data) === null || _balance$data === void 0 ? void 0 : (_balance$data$free = _balance$data.free) === null || _balance$data$free === void 0 ? void 0 : _balance$data$free.toBn()) || new _util.BN(0);
-      const reserved = ((_balance$data2 = balance.data) === null || _balance$data2 === void 0 ? void 0 : (_balance$data2$reserv = _balance$data2.reserved) === null || _balance$data2$reserv === void 0 ? void 0 : _balance$data2$reserv.toBn()) || new _util.BN(0);
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const miscFrozen = ((_balance$data3 = balance.data) === null || _balance$data3 === void 0 ? void 0 : (_balance$data3$miscFr = _balance$data3.miscFrozen) === null || _balance$data3$miscFr === void 0 ? void 0 : _balance$data3$miscFr.toBn()) || (balance === null || balance === void 0 ? void 0 : (_balance$data4 = balance.data) === null || _balance$data4 === void 0 ? void 0 : (_balance$data4$frozen = _balance$data4.frozen) === null || _balance$data4$frozen === void 0 ? void 0 : _balance$data4$frozen.toBn()) || new _util.BN(0);
-      const feeFrozen = ((_balance$data5 = balance.data) === null || _balance$data5 === void 0 ? void 0 : (_balance$data5$feeFro = _balance$data5.feeFrozen) === null || _balance$data5$feeFro === void 0 ? void 0 : _balance$data5$feeFro.toBn()) || new _util.BN(0);
-      let locked = reserved.add(miscFrozen);
-      total = total.add(reserved);
-      const pooledStakingBalance = pooledStakingBalances[index] || _util.BN_ZERO;
-      if (pooledStakingBalance.gt(_util.BN_ZERO)) {
-        total = total.add(pooledStakingBalance);
-        locked = locked.add(pooledStakingBalance);
-      }
-      const free = total.sub(locked);
+    const items = balances.map((_balance, index) => {
+      const balanceInfo = _balance.toPrimitive();
+      const poolMemberInfo = poolMemberInfos[index].toPrimitive();
+      const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getActiveStakeInNominationPool)(poolMemberInfo) : '0';
+      const transferableBalance = (0, _systemPallet._getSystemPalletTransferable)(balanceInfo, (0, _utils2._getChainExistentialDeposit)(chainInfo), extrinsicType);
+      const totalBalance = (0, _systemPallet._getSystemPalletTotalBalance)(balanceInfo);
+      const totalLockedFromTransfer = new _bignumber.default(totalBalance).minus(transferableBalance).plus(nominationPoolBalance);
       return {
         address: addresses[index],
         tokenSlug: chainNativeTokenSlug,
-        free: free.gte(_util.BN_ZERO) ? free.toString() : '0',
-        locked: locked.toString(),
+        free: transferableBalance,
+        locked: totalLockedFromTransfer.toFixed(),
         state: _KoniTypes.APIItemState.READY,
-        substrateInfo: {
-          miscFrozen: miscFrozen.toString(),
-          reserved: reserved.toString(),
-          feeFrozen: feeFrozen.toString()
-        }
+        metadata: balanceInfo
       };
     });
     callback(items);
@@ -183,14 +160,14 @@ const subscribeWithSystemAccountPallet = async _ref => {
     subscription.unsubscribe();
   };
 };
-const subscribeBridgedBalance = async _ref4 => {
+const subscribeBridgedBalance = async _ref3 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref4;
+  } = _ref3;
   const chain = chainInfo.slug;
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
 
@@ -223,11 +200,7 @@ const subscribeBridgedBalance = async _ref4 => {
               tokenSlug: tokenInfo.slug,
               free: free.toString(),
               locked: frozen.toString(),
-              state: _KoniTypes.APIItemState.READY,
-              substrateInfo: {
-                miscFrozen: frozen.toString(),
-                reserved: '0'
-              }
+              state: _KoniTypes.APIItemState.READY
             };
           });
           callback(items);
@@ -253,19 +226,19 @@ function extractOkResponse(response) {
   }
   return undefined;
 }
-const subscribePSP22Balance = _ref5 => {
+const subscribePSP22Balance = _ref4 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref5;
+  } = _ref4;
   const chain = chainInfo.slug;
   const psp22ContractMap = {};
   const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
-  Object.entries(tokenList).forEach(_ref6 => {
-    let [slug, tokenInfo] = _ref6;
+  Object.entries(tokenList).forEach(_ref5 => {
+    let [slug, tokenInfo] = _ref5;
     psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(substrateApi, (0, _utils2._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {
@@ -312,7 +285,7 @@ const subscribePSP22Balance = _ref5 => {
     clearInterval(interval);
   };
 };
-const subscribeTokensAccountsPallet = async _ref7 => {
+const subscribeTokensAccountsPallet = async _ref6 => {
   let {
     addresses,
     assetMap,
@@ -320,7 +293,7 @@ const subscribeTokensAccountsPallet = async _ref7 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref7;
+  } = _ref6;
   const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
@@ -346,11 +319,7 @@ const subscribeTokensAccountsPallet = async _ref7 => {
             tokenSlug: tokenInfo.slug,
             state: _KoniTypes.APIItemState.READY,
             free: freeBalance.toString(),
-            locked: lockedBalance.toString(),
-            substrateInfo: {
-              reserved: tokenBalance.reserved.toString(),
-              miscFrozen: tokenBalance.frozen.toString()
-            }
+            locked: lockedBalance.toString()
           };
         });
         callback(items);
@@ -366,7 +335,7 @@ const subscribeTokensAccountsPallet = async _ref7 => {
     });
   };
 };
-const subscribeAssetsAccountPallet = async _ref8 => {
+const subscribeAssetsAccountPallet = async _ref7 => {
   let {
     addresses,
     assetMap,
@@ -374,7 +343,7 @@ const subscribeAssetsAccountPallet = async _ref8 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref8;
+  } = _ref7;
   const chain = chainInfo.slug;
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
@@ -409,11 +378,7 @@ const subscribeAssetsAccountPallet = async _ref8 => {
             tokenSlug: tokenInfo.slug,
             free: free.toString(),
             locked: frozen.toString(),
-            state: _KoniTypes.APIItemState.READY,
-            substrateInfo: {
-              miscFrozen: frozen.toString(),
-              reserved: '0'
-            }
+            state: _KoniTypes.APIItemState.READY
           };
         });
         callback(items);
@@ -431,14 +396,14 @@ const subscribeAssetsAccountPallet = async _ref8 => {
 };
 
 // eslint-disable-next-line @typescript-eslint/require-await
-const subscribeOrmlTokensPallet = async _ref9 => {
+const subscribeOrmlTokensPallet = async _ref8 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref9;
+  } = _ref8;
   const chain = chainInfo.slug;
   const tokenTypes = [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
@@ -465,11 +430,7 @@ const subscribeOrmlTokensPallet = async _ref9 => {
             tokenSlug: tokenInfo.slug,
             state: _KoniTypes.APIItemState.READY,
             free: freeBalance.toString(),
-            locked: lockedBalance.toString(),
-            substrateInfo: {
-              reserved: tokenBalance.reserved.toString(),
-              miscFrozen: tokenBalance.frozen.toString()
-            }
+            locked: lockedBalance.toString()
           };
         });
         callback(items);
@@ -488,14 +449,14 @@ const subscribeOrmlTokensPallet = async _ref9 => {
     });
   };
 };
-const subscribeGRC20Balance = _ref10 => {
+const subscribeGRC20Balance = _ref9 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref10;
+  } = _ref9;
   if (!(substrateApi instanceof _api.GearApi)) {
     console.warn('Cannot subscribe GRC20 balance without GearApi instance');
     return _util.noop;
@@ -503,8 +464,8 @@ const subscribeGRC20Balance = _ref10 => {
   const chain = chainInfo.slug;
   const psp22ContractMap = {};
   const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
-  Object.entries(tokenList).forEach(_ref11 => {
-    let [slug, tokenInfo] = _ref11;
+  Object.entries(tokenList).forEach(_ref10 => {
+    let [slug, tokenInfo] = _ref10;
     psp22ContractMap[slug] = (0, _utils3.getGRC20ContractPromise)(substrateApi, (0, _utils2._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {

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

@@ -165,8 +165,8 @@ class BalanceService {
     });
   }
 
-  /** Subscribe token free balance of a address on chain */
-  async subscribeTokenFreeBalance(address, chain, tokenSlug, callback) {
+  /** Subscribe token free balance of an address on chain */
+  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -199,7 +199,8 @@ class BalanceService {
           const balance = {
             value: rs.free,
             decimals: tokenInfo.decimals || 0,
-            symbol: tokenInfo.symbol
+            symbol: tokenInfo.symbol,
+            metadata: rs.metadata
           };
           if (callback) {
             callback(balance);
@@ -210,7 +211,7 @@ class BalanceService {
           }
           resolve([unsub, balance]);
         }
-      });
+      }, extrinsicType);
       setTimeout(() => {
         if (hasError) {
           var _unsub2;
@@ -224,15 +225,16 @@ class BalanceService {
   /**
    * @public
    * @async
-   * @function getTokenFreeBalance
+   * @function getTransferableBalance
    * @desc Fetch free balance on chain
    * @param {string} address - Address
    * @param {string} chain - Slug of chain
    * @param {string} [tokenSlug] - Slug of token
+   * @param extrinsicType - Customize transferable based on context
    * @return {Promise<AmountData>} - Free token balance of address on chain
-  */
-  async getTokenFreeBalance(address, chain, tokenSlug) {
-    const [, balance] = await this.subscribeTokenFreeBalance(address, chain, tokenSlug);
+   */
+  async getTransferableBalance(address, chain, tokenSlug, extrinsicType) {
+    const [, balance] = await this.subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
 
@@ -334,7 +336,7 @@ class BalanceService {
     }).map(asset => asset.slug);
     const unsub = (0, _helpers.subscribeBalance)(addresses, activeChainSlugs, assets, assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
       !cancel && this.setBalanceItem(result);
-    });
+    }, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
     const unsub2 = this.state.subscribeMantaPayBalance();
     this._unsubscribeBalance = () => {
       cancel = true;

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

@@ -497,7 +497,6 @@ class ChainService {
           needUpdateChainApiList,
           storedChainInfoList
         } = (0, _utils.updateLatestChainInfo)(this.dataMap, latestChainInfo);
-        console.log('here', needUpdateChainApiList, storedChainInfoList);
         this.dbService.bulkUpdateChainStore(storedChainInfoList).catch(console.error);
         this.updateChainSubscription();
         needUpdateChainApiList.forEach(chainInfo => {

package/cjs/services/chain-service/utils/index.js

@@ -78,6 +78,7 @@ var _exportNames = {
   findChainInfoByHalfGenesisHash: true,
   findChainInfoByChainId: true,
   _isMantaZkAsset: true,
+  _getChainExistentialDeposit: true,
   randomizeProvider: true,
   _isAssetCanPayTxFee: true,
   updateLatestChainInfo: true
@@ -90,6 +91,7 @@ exports._getAssetOriginChain = _getAssetOriginChain;
 exports._getAssetPriceId = _getAssetPriceId;
 exports._getAssetSymbol = _getAssetSymbol;
 exports._getBlockExplorerFromChain = _getBlockExplorerFromChain;
+exports._getChainExistentialDeposit = _getChainExistentialDeposit;
 exports._getChainName = _getChainName;
 exports._getChainNativeTokenBasicInfo = _getChainNativeTokenBasicInfo;
 exports._getChainNativeTokenSlug = _getChainNativeTokenSlug;
@@ -582,6 +584,10 @@ exports.findChainInfoByChainId = findChainInfoByChainId;
 function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
 }
+function _getChainExistentialDeposit(chainInfo) {
+  var _chainInfo$substrateI18;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.existentialDeposit) || '0';
+}
 function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {
     return {

package/cjs/services/earning-service/handlers/base.js

@@ -134,7 +134,7 @@ class BasePoolHandler {
       };
     }
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(this.chain);
-    const nativeTokenBalance = await this.state.balanceService.getTokenFreeBalance(request.address, this.chain);
+    const nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain);
     const bnNativeTokenBalance = new _util.BN(nativeTokenBalance.value);
     const bnMinBalanceToJoin = new _util.BN(((_poolInfo$statistic2 = poolInfo.statistic) === null || _poolInfo$statistic2 === void 0 ? void 0 : (_poolInfo$statistic2$ = _poolInfo$statistic2.earningThreshold) === null || _poolInfo$statistic2$ === void 0 ? void 0 : _poolInfo$statistic2$.join) || '0').add(new _util.BN(poolInfo.metadata.maintainBalance));
     if (bnNativeTokenBalance.lte(bnMinBalanceToJoin)) {

package/cjs/services/earning-service/handlers/special.js

@@ -74,11 +74,11 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const feeAssetInfo = this.state.chainService.getAssetBySlug(this.feeAssets[0]);
     const altInputAssetInfo = this.state.chainService.getAssetBySlug(this.altInputAsset);
     const inputAssetInfo = this.state.chainService.getAssetBySlug(this.inputAsset);
-    const [inputAssetBalance, altInputAssetBalance, feeAssetBalance] = await Promise.all([this.state.balanceService.getTokenFreeBalance(request.address, inputAssetInfo.originChain, inputAssetInfo.slug), altInputAssetInfo ? this.state.balanceService.getTokenFreeBalance(request.address, altInputAssetInfo.originChain, altInputAssetInfo.slug) : Promise.resolve({
+    const [inputAssetBalance, altInputAssetBalance, feeAssetBalance] = await Promise.all([this.state.balanceService.getTransferableBalance(request.address, inputAssetInfo.originChain, inputAssetInfo.slug), altInputAssetInfo ? this.state.balanceService.getTransferableBalance(request.address, altInputAssetInfo.originChain, altInputAssetInfo.slug) : Promise.resolve({
       symbol: '',
       decimals: 0,
       value: '0'
-    }), this.state.balanceService.getTokenFreeBalance(request.address, feeAssetInfo.originChain, feeAssetInfo.slug)]);
+    }), this.state.balanceService.getTransferableBalance(request.address, feeAssetInfo.originChain, feeAssetInfo.slug)]);
     const bnInputAssetBalance = new _util.BN(inputAssetBalance.value);
     const bnAltInputAssetBalance = new _util.BN(altInputAssetBalance.value);
     const bnMinJoinPool = new _util.BN(poolInfo.statistic.earningThreshold.join);
@@ -200,13 +200,13 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const bnAmount = new _util.BN(amount);
     const inputTokenSlug = this.inputAsset; // assume that the pool only has 1 input token, will update later
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const inputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, inputTokenInfo.originChain, inputTokenSlug);
+    const inputTokenBalance = await this.state.balanceService.getTransferableBalance(address, inputTokenInfo.originChain, inputTokenSlug);
     const bnInputTokenBalance = new _util.BN(inputTokenBalance.value);
     if (!bnInputTokenBalance.gte(bnAmount)) {
       if (this.altInputAsset) {
         const altInputTokenSlug = this.altInputAsset;
         const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
-        const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
+        const altInputTokenBalance = await this.state.balanceService.getTransferableBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
         const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
         if (bnAltInputTokenBalance.gt(_util.BN_ZERO)) {
           const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
@@ -279,17 +279,16 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const altInputTokenSlug = this.altInputAsset || '';
     const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
     const inputTokenInfo = this.state.getAssetBySlug(this.inputAsset);
-    const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(params.address, altInputTokenInfo.originChain, altInputTokenSlug);
+    const altInputTokenBalance = await this.state.balanceService.getTransferableBalance(params.address, altInputTokenInfo.originChain, altInputTokenSlug);
     const missingAmount = bnAmount.sub(bnInputTokenBalance); // TODO: what if input token is not LOCAL ??
     const xcmFee = new _util.BN(path.totalFee[1].amount || '0');
     const xcmAmount = missingAmount.add(xcmFee);
     const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
-    const altInputTokenMinAmount = new _util.BN(altInputTokenInfo.minAmount || '0');
-    if (!bnAltInputTokenBalance.sub(xcmAmount).gte(altInputTokenMinAmount)) {
+    if (!bnAltInputTokenBalance.sub(xcmAmount).gt(_util.BN_ZERO)) {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
-      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee).sub(altInputTokenMinAmount);
+      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
       const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -297,7 +296,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       const inputNetworkName = this.chainInfo.name;
       const altNetworkName = altNetwork.name;
       const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee).sub(altInputTokenMinAmount);
+      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
       processValidation.message = (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
@@ -334,7 +333,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     if (this.feeAssets.length === 1 && feeTokenSlug === defaultFeeTokenSlug) {
       var _path$totalFee$id;
       const bnFeeAmount = new _util.BN(((_path$totalFee$id = path.totalFee[id]) === null || _path$totalFee$id === void 0 ? void 0 : _path$totalFee$id.amount) || '0');
-      const feeTokenBalance = await this.state.balanceService.getTokenFreeBalance(params.address, feeTokenInfo.originChain, feeTokenSlug);
+      const feeTokenBalance = await this.state.balanceService.getTransferableBalance(params.address, feeTokenInfo.originChain, feeTokenSlug);
       const bnFeeTokenBalance = new _util.BN(feeTokenBalance.value || '0');
       const bnFeeTokenMinAmount = new _util.BN((feeTokenInfo === null || feeTokenInfo === void 0 ? void 0 : feeTokenInfo.minAmount) || '0');
       if (!bnFeeTokenBalance.sub(bnFeeAmount).gte(bnFeeTokenMinAmount)) {
@@ -372,7 +371,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const balanceService = this.state.balanceService;
-    const inputTokenBalance = await balanceService.getTokenFreeBalance(params.address, inputTokenInfo.originChain, inputTokenSlug);
+    const inputTokenBalance = await balanceService.getTransferableBalance(params.address, inputTokenInfo.originChain, inputTokenSlug);
     const bnInputTokenBalance = new _util.BN(inputTokenBalance.value || '0');
     const bnAmount = new _util.BN(params.amount);
     if (bnAmount.lte(_util.BN_ZERO)) {
@@ -422,7 +421,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const originTokenInfo = this.state.getAssetBySlug(originTokenSlug);
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);
     const substrateApi = this.state.getSubstrateApi(originChainInfo.slug);
-    const inputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, destinationTokenInfo.originChain, destinationTokenSlug);
+    const inputTokenBalance = await this.state.balanceService.getTransferableBalance(address, destinationTokenInfo.originChain, destinationTokenSlug);
     const bnInputTokenBalance = new _util.BN(inputTokenBalance.value);
     const bnXcmFee = new _util.BN(xcmFee);
     const bnAmount = new _util.BN(amount);