@subwallet/extension-base 1.3.67-0 → 1.3.68-0

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

@@ -32,6 +32,7 @@ var _keyringService = require("@subwallet/extension-base/services/keyring-servic
 var _migrationService = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service"));
 var _mintCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mint-campaign-service"));
 var _mktCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mkt-campaign-service"));
+var _nftService = _interopRequireDefault(require("@subwallet/extension-base/services/nft-service"));
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
 var _requestService = _interopRequireDefault(require("@subwallet/extension-base/services/request-service"));
@@ -121,6 +122,7 @@ class KoniState {
     this.migrationService = new _migrationService.default(this, this.eventService);
     this.campaignService = new _campaignService.default(this);
     this.mktCampaignService = new _mktCampaignService.default(this);
+    this.nftDetectionService = new _nftService.default(this);
     this.buyService = new _buyService.default(this);
     this.earningService = new _service.default(this);
     this.swapService = new _swapService.SwapService(this);
@@ -405,6 +407,29 @@ class KoniState {
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
+  async handleDetectedNfts(address, nftItems) {
+    try {
+      const chainSlugs = this.activeChainSlugs;
+      const currentNfts = await this.dbService.getNft([address], chainSlugs);
+      const newNfts = nftItems.filter(n => !currentNfts.some(c => c.id === n.id));
+      for (const nft of newNfts) {
+        this.updateNftData(nft.chain, nft, address);
+      }
+    } catch (e) {
+      this.logger.warn('handleDetectedNfts error:', e);
+    }
+  }
+  async handleDetectedNftCollections(collections) {
+    try {
+      const currentCollections = await this.getNftCollection();
+      const newCollections = collections.filter(col => !currentCollections.some(c => c.collectionId === col.collectionId && c.chain === col.chain));
+      for (const col of newCollections) {
+        this.setNftCollection(col.chain, col);
+      }
+    } catch (e) {
+      this.logger.warn('handleDetectedNftCollections error:', e);
+    }
+  }
   cleanUpNfts(chain, owner, collectionId, nftIds, ownNothing) {
     this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
   }

package/cjs/packageInfo.js

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

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

@@ -19,11 +19,40 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
  */
 const groupBalance = (items, address, token) => {
   const states = items.map(item => item.state);
+  const sum = selector => _bignumber.default.sum.apply(null, items.map(selector)).toFixed();
+  const staking = sum(i => {
+    var _i$lockedDetails$stak, _i$lockedDetails;
+    return (_i$lockedDetails$stak = (_i$lockedDetails = i.lockedDetails) === null || _i$lockedDetails === void 0 ? void 0 : _i$lockedDetails.staking) !== null && _i$lockedDetails$stak !== void 0 ? _i$lockedDetails$stak : '0';
+  });
+  const governance = sum(i => {
+    var _i$lockedDetails$gove, _i$lockedDetails2;
+    return (_i$lockedDetails$gove = (_i$lockedDetails2 = i.lockedDetails) === null || _i$lockedDetails2 === void 0 ? void 0 : _i$lockedDetails2.governance) !== null && _i$lockedDetails$gove !== void 0 ? _i$lockedDetails$gove : '0';
+  });
+  const democracy = sum(i => {
+    var _i$lockedDetails$demo, _i$lockedDetails3;
+    return (_i$lockedDetails$demo = (_i$lockedDetails3 = i.lockedDetails) === null || _i$lockedDetails3 === void 0 ? void 0 : _i$lockedDetails3.democracy) !== null && _i$lockedDetails$demo !== void 0 ? _i$lockedDetails$demo : '0';
+  });
+  const reserved = sum(i => {
+    var _i$lockedDetails$rese, _i$lockedDetails4;
+    return (_i$lockedDetails$rese = (_i$lockedDetails4 = i.lockedDetails) === null || _i$lockedDetails4 === void 0 ? void 0 : _i$lockedDetails4.reserved) !== null && _i$lockedDetails$rese !== void 0 ? _i$lockedDetails$rese : '0';
+  });
+  const others = sum(i => {
+    var _i$lockedDetails$othe, _i$lockedDetails5;
+    return (_i$lockedDetails$othe = (_i$lockedDetails5 = i.lockedDetails) === null || _i$lockedDetails5 === void 0 ? void 0 : _i$lockedDetails5.others) !== null && _i$lockedDetails$othe !== void 0 ? _i$lockedDetails$othe : '0';
+  });
+  const hasLockedDetails = new _bignumber.default(staking).gt(0) || new _bignumber.default(governance).gt(0) || new _bignumber.default(democracy).gt(0) || new _bignumber.default(others).gt(0);
   return {
     address,
     tokenSlug: token,
-    free: _bignumber.default.sum.apply(null, items.map(item => item.free)).toFixed(),
-    locked: _bignumber.default.sum.apply(null, items.map(item => item.locked)).toFixed(),
+    free: sum(i => i.free),
+    locked: sum(i => i.locked),
+    lockedDetails: hasLockedDetails ? {
+      staking,
+      governance,
+      democracy,
+      reserved,
+      others
+    } : undefined,
     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
   };
 };

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

@@ -25,6 +25,7 @@ var _rxjs = require("rxjs");
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
 var _gear = require("./gear");
+var _utils4 = require("./utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -116,7 +117,6 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
   };
 };
 
-// handler according to different logic
 // eslint-disable-next-line @typescript-eslint/require-await
 exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
 const subscribeWithSystemAccountPallet = async _ref => {
@@ -149,16 +149,10 @@ const subscribeWithSystemAccountPallet = async _ref => {
   const subscription = substrateApi.subscribeDataWithMulti(params, async rs => {
     const balances = rs[systemAccountKey];
     const poolMemberInfos = rs[poolMembersKey];
-    let bittensorStakingBalances = new Array(addresses.length).fill(new _bignumber.default(0));
-    if (_constants2._BALANCE_CHAIN_GROUP.bittensor.includes(chainInfo.slug)) {
-      const rawData = await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkeys(addresses);
-      const values = rawData.toPrimitive();
-      bittensorStakingBalances = values.map(_ref2 => {
-        let [, stakes] = _ref2;
-        return stakes.filter(i => i.netuid === 0).reduce((previousValue, currentValue) => previousValue.plus(currentValue.stake), (0, _bignumber.default)(0));
-      });
-    }
-    const items = balances.map((_balance, index) => {
+    const bittensorStakingBalances = await (0, _utils4.getSpecialStakingBalances)(chainInfo, addresses, substrateApi);
+
+    // Precompute totalLockedFromTransfer for each account to decide if need fetch locks/holds
+    const preItems = balances.map((_balance, index) => {
       const balanceInfo = _balance;
       const transferableBalance = (0, _systemPallet._getSystemPalletTransferable)(balanceInfo, (0, _utils2._getChainExistentialDeposit)(chainInfo), extrinsicType);
       const totalBalance = (0, _systemPallet._getSystemPalletTotalBalance)(balanceInfo);
@@ -168,14 +162,58 @@ const subscribeWithSystemAccountPallet = async _ref => {
         const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : BigInt(0);
         totalLockedFromTransfer += nominationPoolBalance;
       }
-      const stakeValue = BigInt(bittensorStakingBalances[index].toString());
-      totalLockedFromTransfer += stakeValue;
+      totalLockedFromTransfer += BigInt(bittensorStakingBalances[index].toString());
+      return {
+        index,
+        totalLockedFromTransfer,
+        balanceInfo
+      };
+    });
+
+    // Filter account's locked > 0
+    const accountsWithLocks = preItems.filter(i => i.totalLockedFromTransfer > 0).map(i => addresses[i.index]);
+    let locks = [];
+    let holds = [];
+    let freezes = [];
+
+    // Fetch locks/holds only for accounts that have locked balances
+    if (accountsWithLocks.length > 0) {
+      const [rawLocks, rawHolds, rawFreezes] = await Promise.all([substrateApi.api.query.balances.locks.multi(accountsWithLocks), substrateApi.api.query.balances.holds.multi(accountsWithLocks), substrateApi.api.query.balances.freezes.multi(accountsWithLocks)]);
+      locks = rawLocks.map(lockArr => lockArr.map(l => ({
+        id: l.id.toPrimitive(),
+        amount: l.amount.toString()
+      })));
+      holds = rawHolds.map(holdArr => holdArr.map(h => ({
+        id: h.id.toPrimitive(),
+        amount: h.amount.toString()
+      })));
+      freezes = rawFreezes.map(freezeArr => freezeArr.map(f => ({
+        id: f.id.toPrimitive(),
+        amount: f.amount.toString()
+      })));
+    }
+
+    // Map locks/holds back to original index
+    const items = preItems.map(_ref2 => {
+      let {
+        balanceInfo,
+        index,
+        totalLockedFromTransfer
+      } = _ref2;
+      const lockIndex = accountsWithLocks.indexOf(addresses[index]);
+      const lockItems = lockIndex >= 0 ? locks[lockIndex] || [] : [];
+      const holdItems = lockIndex >= 0 ? holds[lockIndex] || [] : [];
+      const freezeItems = lockIndex >= 0 ? freezes[lockIndex] || [] : [];
+      const allLockEntries = [...lockItems, ...holdItems, ...freezeItems];
+      const lockedDetails = (0, _utils4.buildLockedDetails)(allLockEntries, totalLockedFromTransfer, (0, _systemPallet._getSystemPalletReservedBalance)(balanceInfo), bittensorStakingBalances[index]);
+      const transferableBalance = (0, _systemPallet._getSystemPalletTransferable)(balanceInfo, (0, _utils2._getChainExistentialDeposit)(chainInfo), extrinsicType);
       return {
         address: addresses[index],
         tokenSlug: (0, _utils2._getChainNativeTokenSlug)(chainInfo),
         free: transferableBalance.toString(),
         locked: totalLockedFromTransfer.toString(),
         state: _KoniTypes.APIItemState.READY,
+        lockedDetails,
         metadata: balanceInfo
       };
     });

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

@@ -0,0 +1,69 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildLockedDetails = buildLockedDetails;
+exports.getSpecialStakingBalances = getSpecialStakingBalances;
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+async function getSpecialStakingBalances(chainInfo, addresses, substrateApi) {
+  // Default: 0 for all addresses
+  let balances = new Array(addresses.length).fill(new _bignumber.default(0));
+
+  // --- Bittensor ----------------------------------------------------------------
+  if (_constants._BALANCE_CHAIN_GROUP.bittensor.includes(chainInfo.slug)) {
+    const rawData = await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkeys(addresses);
+    const values = rawData.toPrimitive();
+    balances = values.map(_ref => {
+      let [, stakes] = _ref;
+      return stakes.filter(i => i.netuid === 0).reduce((prev, curr) => prev.plus(curr.stake), (0, _bignumber.default)(0));
+    });
+    return balances;
+  }
+  return balances;
+}
+
+// handler according to different logic
+const extractId = id => {
+  if (!id) {
+    return '';
+  }
+  if (typeof id === 'string') {
+    return id.replace(/\0/g, '').trim();
+  }
+  const keys = Object.keys(id);
+  return keys.length ? keys[0] : '';
+};
+function buildLockedDetails(item, totalLockedFromTransfer, reserved, externalStaking) {
+  let stakingBalance = externalStaking || new _bignumber.default(0);
+  let govBalance = new _bignumber.default(0);
+  let democracyBalance = new _bignumber.default(0);
+  const reservedBN = new _bignumber.default(reserved.toString());
+  for (const entry of item) {
+    const id = extractId(entry.id);
+    const amount = new _bignumber.default(String(entry.amount || 0));
+    if (_constants._BALANCE_LOCKED_ID_GROUP.staking.includes(id)) {
+      stakingBalance = stakingBalance.plus(amount);
+    } else if (_constants._BALANCE_LOCKED_ID_GROUP.gov.includes(id)) {
+      govBalance = govBalance.plus(amount);
+    } else if (_constants._BALANCE_LOCKED_ID_GROUP.democracy.includes(id)) {
+      democracyBalance = democracyBalance.plus(amount);
+    }
+  }
+
+  // others = total locked - max(staking, gov, democracy, reserved)
+  const maxMain = _bignumber.default.max(stakingBalance, govBalance, democracyBalance, reservedBN);
+  const others = new _bignumber.default(totalLockedFromTransfer.toString()).minus(maxMain);
+  return {
+    staking: stakingBalance.toFixed(),
+    governance: govBalance.toFixed(),
+    democracy: democracyBalance.toFixed(),
+    reserved: reservedBN.toFixed(),
+    others: others.gt(0) ? others.toFixed() : '0'
+  };
+}

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

@@ -13,15 +13,17 @@ var _process = require("@subwallet/extension-base/services/balance-service/helpe
 var _types = require("@subwallet/extension-base/services/base/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _DetectAccountBalance = _interopRequireDefault(require("@subwallet/extension-base/stores/DetectAccountBalance"));
+var _types2 = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
-var _types2 = require("@subwallet/keyring/types");
+var _types3 = require("@subwallet/keyring/types");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
+var _constants2 = require("../chain-service/constants");
 var _acrossBridge = require("./transfer/xcm/acrossBridge");
 var _BalanceMapImpl = require("./BalanceMapImpl");
 var _helpers = require("./helpers");
@@ -182,7 +184,7 @@ class BalanceService {
 
   /** Subscribe token free balance of an address on chain */
   async subscribeBalance(address, chain, tokenSlug) {
-    let balanceType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'transferable';
+    let balanceType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _types2.BalanceType.TRANSFERABLE;
     let extrinsicType = arguments.length > 4 ? arguments[4] : undefined;
     let callback = arguments.length > 5 ? arguments[5] : undefined;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -217,9 +219,20 @@ class BalanceService {
         const rs = result[0];
         let value;
         switch (balanceType) {
-          case 'total':
+          case _types2.BalanceType.TOTAL:
             value = new _bignumber.default(rs.free).plus(new _bignumber.default(rs.locked)).toFixed();
             break;
+          case _types2.BalanceType.TOTAL_MINUS_RESERVED:
+            if (_constants2._BALANCE_CHAIN_GROUP.notSupportGetBalanceByType.includes(chainInfo.slug)) {
+              // TODO: Currently Vara and Avail staking from nomination pools is not fully supported.
+              // Return `free` to avoid incorrect TOTAL_MINUS_RESERVED calculation.
+              // Improve later when full staking breakdown is available.
+              value = rs.free;
+            } else {
+              var _rs$lockedDetails, _rs$lockedDetails2;
+              value = new _bignumber.default(rs.free).plus(new _bignumber.default(rs.locked)).minus(_bignumber.default.max(new _bignumber.default(((_rs$lockedDetails = rs.lockedDetails) === null || _rs$lockedDetails === void 0 ? void 0 : _rs$lockedDetails.reserved) || 0), new _bignumber.default(((_rs$lockedDetails2 = rs.lockedDetails) === null || _rs$lockedDetails2 === void 0 ? void 0 : _rs$lockedDetails2.staking) || 0))).toFixed();
+            }
+            break;
           default:
             value = rs.free;
         }
@@ -251,10 +264,16 @@ class BalanceService {
     });
   }
   async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
-    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+    return this.subscribeBalance(address, chain, tokenSlug, _types2.BalanceType.TRANSFERABLE, extrinsicType, callback);
   }
   async subscribeTotalBalance(address, chain, tokenSlug, extrinsicType, callback) {
-    return this.subscribeBalance(address, chain, tokenSlug, 'total', extrinsicType, callback);
+    return this.subscribeBalance(address, chain, tokenSlug, _types2.BalanceType.TOTAL, extrinsicType, callback);
+  }
+  async subscribeBalanceByType(address, chain, tokenSlug) {
+    let balanceType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _types2.BalanceType.TRANSFERABLE;
+    let extrinsicType = arguments.length > 4 ? arguments[4] : undefined;
+    let callback = arguments.length > 5 ? arguments[5] : undefined;
+    return this.subscribeBalance(address, chain, tokenSlug, balanceType, extrinsicType, callback);
   }
 
   /**
@@ -276,6 +295,12 @@ class BalanceService {
     const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getBalanceByType(address, chain, tokenSlug) {
+    let balanceType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _types2.BalanceType.TRANSFERABLE;
+    let extrinsicType = arguments.length > 4 ? arguments[4] : undefined;
+    const [, balance] = await this.subscribeBalanceByType(address, chain, tokenSlug, balanceType, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {
@@ -447,7 +472,7 @@ class BalanceService {
     const assetMap = this.state.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
       const type = (0, _keyring.getKeypairTypeByAddress)(address);
-      const typeValid = [..._types2.SubstrateKeypairTypes, ..._types2.EthereumKeypairTypes].includes(type);
+      const typeValid = [..._types3.SubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return this.state.subscanService.getMultiChainBalance(address).catch(e => {
           console.error(e);
@@ -459,9 +484,9 @@ class BalanceService {
     });
     const evmPromiseList = addresses.map(address => {
       const type = (0, _keyring.getKeypairTypeByAddress)(address);
-      const typeValid = [..._types2.EthereumKeypairTypes].includes(type);
+      const typeValid = [..._types3.EthereumKeypairTypes].includes(type);
       if (typeValid) {
-        return _subwalletServicesSdk.default.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+        return _subwalletServicesSdk.default.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
           console.error(e);
           return null;
         });
@@ -641,7 +666,7 @@ class BalanceService {
   async evmDetectBalanceToken(addresses) {
     const assetMap = this.state.chainService.getAssetRegistry();
     const evmPromiseList = addresses.map(address => {
-      return _subwalletServicesSdk.default.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+      return _subwalletServicesSdk.default.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
         console.error(e);
         return null;
       });
@@ -748,8 +773,8 @@ class BalanceService {
       const assetSettings = await this.state.chainService.getAssetSettings();
       const assetMap = this.state.chainService.getAssetRegistry();
       const addresses = _uiKeyring.default.getPairs().map(account => account.address);
-      const evmAddresses = addresses.filter(address => [..._types2.EthereumKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
-      const substrateAddresses = addresses.filter(address => [..._types2.SubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
+      const evmAddresses = addresses.filter(address => [..._types3.EthereumKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
+      const substrateAddresses = addresses.filter(address => [..._types3.SubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
       const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
       const substrateDetectChain = this.substrateDetectBalanceChain();
       const evmDetectChain = await this.evmDetectBalanceChain();

package/cjs/services/balance-service/transfer/smart-contract.js

@@ -173,7 +173,9 @@ async function getERC721Transaction(web3Api, chain, contractAddress, senderAddre
     const error = e;
     if (error.message.includes('transfer to non ERC721Receiver implementer')) {
       error.message = (0, _i18next.t)('bg.BALANCE.services.service.balance.transfer.smartContract.nftNotSupportedOnRecipient');
+      throw error;
     }
+    error.message = (0, _i18next.t)('bg.BALANCE.services.service.balance.transfer.smartContract.temporarilyNontransferableNFT');
     throw error;
   }
   const feeInfo = _feeInfo;

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

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
-var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -14,8 +13,6 @@ const API_AUTO_CONNECT_MS = 3000;
 exports.API_AUTO_CONNECT_MS = API_AUTO_CONNECT_MS;
 const API_CONNECT_TIMEOUT = 30000;
 exports.API_CONNECT_TIMEOUT = API_CONNECT_TIMEOUT;
-const API_MAX_RETRY = 2;
-exports.API_MAX_RETRY = API_MAX_RETRY;
 const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
   turing: ['turingStaging', 'turing'],
@@ -47,14 +44,16 @@ const _BALANCE_CHAIN_GROUP = {
   centrifuge: ['centrifuge'],
   supportBridged: ['rococo_assethub', 'statemint', 'statemine', 'polimec'],
   bittensor: ['bittensor', 'bittensor_testnet'],
-  moonbeam: ['moonbeam', 'moonriver', 'moonbase']
+  moonbeam: ['moonbeam', 'moonriver', 'moonbase'],
+  notSupportGetBalanceByType: ['vara_network', 'vara_testnet', 'availTuringTest', 'avail_mainnet']
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
-const _BALANCE_TOKEN_GROUP = {
-  crab: ['CKTON', 'PKTON'],
-  bitcountry: ['BIT']
+const _BALANCE_LOCKED_ID_GROUP = {
+  staking: ['staking', 'delegatedStaking', 'pooledStaking', 'stkngdel', 'stk_stks', 'dappStaking', 'parachainStaking', 'appstakeappstake', 'collatorStaking'],
+  gov: ['pyconvot'],
+  democracy: ['democrac']
 };
-exports._BALANCE_TOKEN_GROUP = _BALANCE_TOKEN_GROUP;
+exports._BALANCE_LOCKED_ID_GROUP = _BALANCE_LOCKED_ID_GROUP;
 const _NFT_CHAIN_GROUP = {
   acala: ['acala'],
   karura: ['karura'],
@@ -291,13 +290,10 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
 
 // Send fund------------------------------------------------------------------------------------------------------------
 exports._KNOWN_CHAIN_INFLATION_PARAMS = _KNOWN_CHAIN_INFLATION_PARAMS;
-const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
-exports._TRANSFER_NOT_SUPPORTED_CHAINS = _TRANSFER_NOT_SUPPORTED_CHAINS;
 const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
   kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
-  // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub'],
   riochain: ['riochain'],
@@ -309,10 +305,6 @@ const _TRANSFER_CHAIN_GROUP = {
   truth: ['truth_network']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
-const _BALANCE_PARSING_CHAIN_GROUP = {
-  bobabeam: ['bobabeam', 'bobabase']
-};
-exports._BALANCE_PARSING_CHAIN_GROUP = _BALANCE_PARSING_CHAIN_GROUP;
 const _MANTA_ZK_CHAIN_GROUP = ['calamari'];
 exports._MANTA_ZK_CHAIN_GROUP = _MANTA_ZK_CHAIN_GROUP;
 const _ZK_ASSET_PREFIX = 'zk';
@@ -321,21 +313,6 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
-const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos', 'westend_assethub'],
-  polkadotXcmSpecialCases: ['astar', 'shiden'],
-  xcmPallet: ['polkadot', 'kusama', 'rococo', 'westend']
-  // default is xTokens pallet
-};
-exports._XCM_CHAIN_GROUP = _XCM_CHAIN_GROUP;
-const _XCM_TYPE = {
-  RP: `${_types._SubstrateChainType.RELAYCHAIN}-${_types._SubstrateChainType.PARACHAIN}`,
-  // DMP
-  PP: `${_types._SubstrateChainType.PARACHAIN}-${_types._SubstrateChainType.PARACHAIN}`,
-  // HRMP
-  PR: `${_types._SubstrateChainType.PARACHAIN}-${_types._SubstrateChainType.RELAYCHAIN}` // UMP
-};
-exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS, 'vara_network', 'ton'];
 exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
 const EVM_PASS_CONNECT_STATUS = {
@@ -351,10 +328,7 @@ const EVM_REFORMAT_DECIMALS = {
 };
 exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
 const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
-
-// TODO: review
 exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = LATEST_CHAIN_DATA_FETCHING_INTERVAL;
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _BITCOIN_CHAIN_SLUG = 'bitcoin';
 exports._BITCOIN_CHAIN_SLUG = _BITCOIN_CHAIN_SLUG;
 const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet';
@@ -363,17 +337,5 @@ const _BITCOIN_NAME = 'Bitcoin';
 exports._BITCOIN_NAME = _BITCOIN_NAME;
 const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet';
 exports._BITCOIN_TESTNET_NAME = _BITCOIN_TESTNET_NAME;
-const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
-exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
-const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
-exports._CHAIN_ASSET_SRC = _CHAIN_ASSET_SRC;
-const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
-exports._ASSET_REF_SRC = _ASSET_REF_SRC;
-const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
-exports._MULTI_CHAIN_ASSET_SRC = _MULTI_CHAIN_ASSET_SRC;
-const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
-exports._CHAIN_LOGO_MAP_SRC = _CHAIN_LOGO_MAP_SRC;
-const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
-exports._ASSET_LOGO_MAP_SRC = _ASSET_LOGO_MAP_SRC;
 const _BTC_SERVICE_TOKEN = process.env.BTC_SERVICE_TOKEN || '';
 exports._BTC_SERVICE_TOKEN = _BTC_SERVICE_TOKEN;

package/cjs/services/chain-service/handler/EvmChainHandler.js

@@ -126,6 +126,9 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         tokenContract.methods.symbol().call()]);
         name = _name;
         symbol = _symbol;
+        if (name === '') {
+          contractError = true;
+        }
       } else {
         tokenContract = new evmApi.api.eth.Contract(_utils._ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
@@ -138,9 +141,9 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         name = _name;
         decimals = new _bignumber.default(_decimals).toNumber();
         symbol = _symbol;
-      }
-      if (name === '' || symbol === '') {
-        contractError = true;
+        if (name === '' || symbol === '') {
+          contractError = true;
+        }
       }
       return {
         name,

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

@@ -8,6 +8,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _utils = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -162,7 +163,12 @@ class BasePoolHandler {
     }
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(this.chain);
     // Use TRANSFER_BALANCE extrinsic in order to get transferable balanace without minus ED
-    const nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain, undefined, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
+    let nativeTokenBalance;
+    if ([_types.YieldPoolType.NATIVE_STAKING, _types.YieldPoolType.NOMINATION_POOL].includes(poolInfo.type)) {
+      nativeTokenBalance = await this.state.balanceService.getBalanceByType(request.address, this.chain, undefined, _types.BalanceType.TOTAL_MINUS_RESERVED, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
+    } else {
+      nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain, undefined, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
+    }
     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)) {