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

package/koni/background/handlers/State.js

@@ -28,6 +28,7 @@ import { KeyringService } from '@subwallet/extension-base/services/keyring-servi
 import MigrationService from '@subwallet/extension-base/services/migration-service';
 import MintCampaignService from '@subwallet/extension-base/services/mint-campaign-service';
 import MktCampaignService from '@subwallet/extension-base/services/mkt-campaign-service';
+import NftService from '@subwallet/extension-base/services/nft-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
@@ -112,6 +113,7 @@ export default class KoniState {
     this.migrationService = new MigrationService(this, this.eventService);
     this.campaignService = new CampaignService(this);
     this.mktCampaignService = new MktCampaignService(this);
+    this.nftDetectionService = new NftService(this);
     this.buyService = new BuyService(this);
     this.earningService = new EarningService(this);
     this.swapService = new SwapService(this);
@@ -393,6 +395,29 @@ export default 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/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.67-0",
+  "version": "1.3.68-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -739,6 +739,11 @@
       "require": "./cjs/services/balance-service/helpers/subscribe/substrate/gear.js",
       "default": "./services/balance-service/helpers/subscribe/substrate/gear.js"
     },
+    "./services/balance-service/helpers/subscribe/substrate/utils": {
+      "types": "./services/balance-service/helpers/subscribe/substrate/utils.d.ts",
+      "require": "./cjs/services/balance-service/helpers/subscribe/substrate/utils.js",
+      "default": "./services/balance-service/helpers/subscribe/substrate/utils.js"
+    },
     "./services/balance-service/helpers/subscribe/ton/consts": {
       "types": "./services/balance-service/helpers/subscribe/ton/consts.d.ts",
       "require": "./cjs/services/balance-service/helpers/subscribe/ton/consts.js",
@@ -1706,6 +1711,11 @@
       "require": "./cjs/services/mkt-campaign-service/types.js",
       "default": "./services/mkt-campaign-service/types.js"
     },
+    "./services/nft-service": {
+      "types": "./services/nft-service/index.d.ts",
+      "require": "./cjs/services/nft-service/index.js",
+      "default": "./services/nft-service/index.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -2907,12 +2917,12 @@
     "@snowbridge/registry": "^0.2.0",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet-monorepos/subwallet-services-sdk": "0.1.13",
+    "@subwallet-monorepos/subwallet-services-sdk": "0.1.14",
     "@subwallet/chain-list": "0.2.121",
-    "@subwallet/extension-base": "^1.3.67-0",
-    "@subwallet/extension-chains": "^1.3.67-0",
-    "@subwallet/extension-dapp": "^1.3.67-0",
-    "@subwallet/extension-inject": "^1.3.67-0",
+    "@subwallet/extension-base": "^1.3.68-1",
+    "@subwallet/extension-chains": "^1.3.68-1",
+    "@subwallet/extension-dapp": "^1.3.68-1",
+    "@subwallet/extension-inject": "^1.3.68-1",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

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.3.67-0'
+  version: '1.3.68-1'
 };

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

@@ -13,11 +13,40 @@ import BigN from 'bignumber.js';
  */
 export const groupBalance = (items, address, token) => {
   const states = items.map(item => item.state);
+  const sum = selector => BigN.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 BigN(staking).gt(0) || new BigN(governance).gt(0) || new BigN(democracy).gt(0) || new BigN(others).gt(0);
   return {
     address,
     tokenSlug: token,
-    free: BigN.sum.apply(null, items.map(item => item.free)).toFixed(),
-    locked: BigN.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 === APIItemState.NOT_SUPPORT) ? APIItemState.NOT_SUPPORT : states.some(item => item === APIItemState.READY) ? APIItemState.READY : APIItemState.PENDING
   };
 };

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

@@ -8,7 +8,7 @@ import { _getAssetsPalletLocked, _getAssetsPalletTransferable } from '@subwallet
 import { _getForeignAssetPalletLockedBalance, _getForeignAssetPalletTransferable } from '@subwallet/extension-base/core/substrate/foreign-asset-pallet';
 import { _getTotalStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
 import { _getOrmlTokensPalletLockedBalance, _getOrmlTokensPalletTransferable } from '@subwallet/extension-base/core/substrate/ormlTokens-pallet';
-import { _getSystemPalletTotalBalance, _getSystemPalletTransferable } from '@subwallet/extension-base/core/substrate/system-pallet';
+import { _getSystemPalletReservedBalance, _getSystemPalletTotalBalance, _getSystemPalletTransferable } from '@subwallet/extension-base/core/substrate/system-pallet';
 import { _getTokensPalletLocked, _getTokensPalletTransferable } from '@subwallet/extension-base/core/substrate/tokens-pallet';
 import { _adaptX1Interior } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
@@ -21,6 +21,7 @@ import { timer } from 'rxjs';
 import { subscribeERC20Interval } from "../evm.js";
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
 import { subscribeGRC20Balance, subscribeVftBalance } from "./gear.js";
+import { buildLockedDetails, getSpecialStakingBalances } from "./utils.js";
 export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback, extrinsicType) => {
   let unsubNativeToken;
   let unsubLocalToken;
@@ -109,7 +110,6 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
   };
 };
 
-// handler according to different logic
 // eslint-disable-next-line @typescript-eslint/require-await
 const subscribeWithSystemAccountPallet = async ({
   addresses,
@@ -140,15 +140,10 @@ const subscribeWithSystemAccountPallet = async ({
   const subscription = substrateApi.subscribeDataWithMulti(params, async rs => {
     const balances = rs[systemAccountKey];
     const poolMemberInfos = rs[poolMembersKey];
-    let bittensorStakingBalances = new Array(addresses.length).fill(new BigN(0));
-    if (_BALANCE_CHAIN_GROUP.bittensor.includes(chainInfo.slug)) {
-      const rawData = await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkeys(addresses);
-      const values = rawData.toPrimitive();
-      bittensorStakingBalances = values.map(([, stakes]) => {
-        return stakes.filter(i => i.netuid === 0).reduce((previousValue, currentValue) => previousValue.plus(currentValue.stake), BigN(0));
-      });
-    }
-    const items = balances.map((_balance, index) => {
+    const bittensorStakingBalances = await 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 = _getSystemPalletTransferable(balanceInfo, _getChainExistentialDeposit(chainInfo), extrinsicType);
       const totalBalance = _getSystemPalletTotalBalance(balanceInfo);
@@ -158,14 +153,57 @@ const subscribeWithSystemAccountPallet = async ({
         const nominationPoolBalance = poolMemberInfo ? _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(({
+      balanceInfo,
+      index,
+      totalLockedFromTransfer
+    }) => {
+      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 = buildLockedDetails(allLockEntries, totalLockedFromTransfer, _getSystemPalletReservedBalance(balanceInfo), bittensorStakingBalances[index]);
+      const transferableBalance = _getSystemPalletTransferable(balanceInfo, _getChainExistentialDeposit(chainInfo), extrinsicType);
       return {
         address: addresses[index],
         tokenSlug: _getChainNativeTokenSlug(chainInfo),
         free: transferableBalance.toString(),
         locked: totalLockedFromTransfer.toString(),
         state: APIItemState.READY,
+        lockedDetails,
         metadata: balanceInfo
       };
     });

package/services/balance-service/helpers/subscribe/substrate/utils.d.ts

@@ -0,0 +1,7 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
+import { FrameBalancesFreezesInfo, FrameBalancesHoldsInfo, FrameBalancesLocksInfo } from '@subwallet/extension-base/core/substrate/types';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { LockedBalanceDetails } from '@subwallet/extension-base/types';
+import BigN from 'bignumber.js';
+export declare function getSpecialStakingBalances(chainInfo: _ChainInfo, addresses: string[], substrateApi: _SubstrateApi): Promise<BigN[]>;
+export declare function buildLockedDetails(item: (FrameBalancesLocksInfo | FrameBalancesHoldsInfo | FrameBalancesFreezesInfo)[], totalLockedFromTransfer: bigint, reserved: bigint, externalStaking?: BigN): LockedBalanceDetails;

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

@@ -0,0 +1,58 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { _BALANCE_CHAIN_GROUP, _BALANCE_LOCKED_ID_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import BigN from 'bignumber.js';
+export async function getSpecialStakingBalances(chainInfo, addresses, substrateApi) {
+  // Default: 0 for all addresses
+  let balances = new Array(addresses.length).fill(new BigN(0));
+
+  // --- Bittensor ----------------------------------------------------------------
+  if (_BALANCE_CHAIN_GROUP.bittensor.includes(chainInfo.slug)) {
+    const rawData = await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkeys(addresses);
+    const values = rawData.toPrimitive();
+    balances = values.map(([, stakes]) => stakes.filter(i => i.netuid === 0).reduce((prev, curr) => prev.plus(curr.stake), BigN(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] : '';
+};
+export function buildLockedDetails(item, totalLockedFromTransfer, reserved, externalStaking) {
+  let stakingBalance = externalStaking || new BigN(0);
+  let govBalance = new BigN(0);
+  let democracyBalance = new BigN(0);
+  const reservedBN = new BigN(reserved.toString());
+  for (const entry of item) {
+    const id = extractId(entry.id);
+    const amount = new BigN(String(entry.amount || 0));
+    if (_BALANCE_LOCKED_ID_GROUP.staking.includes(id)) {
+      stakingBalance = stakingBalance.plus(amount);
+    } else if (_BALANCE_LOCKED_ID_GROUP.gov.includes(id)) {
+      govBalance = govBalance.plus(amount);
+    } else if (_BALANCE_LOCKED_ID_GROUP.democracy.includes(id)) {
+      democracyBalance = democracyBalance.plus(amount);
+    }
+  }
+
+  // others = total locked - max(staking, gov, democracy, reserved)
+  const maxMain = BigN.max(stakingBalance, govBalance, democracyBalance, reservedBN);
+  const others = new BigN(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/services/balance-service/index.d.ts

@@ -3,7 +3,7 @@ import KoniState from '@subwallet/extension-base/koni/background/handlers/State'
 import { RequestOptimalTransferProcess } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { EventItem, EventType } from '@subwallet/extension-base/services/event-service/types';
-import { BalanceItem, BalanceJson, CommonOptimalTransferPath } from '@subwallet/extension-base/types';
+import { BalanceItem, BalanceJson, BalanceType, CommonOptimalTransferPath } from '@subwallet/extension-base/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 /**
@@ -48,9 +48,10 @@ export declare class BalanceService implements StoppableServiceInterface {
     getBalanceDetectCache(update: (value: DetectBalanceCache) => void): void;
     setBalanceDetectCache(addresses: string[]): void;
     /** Subscribe token free balance of an address on chain */
-    subscribeBalance(address: string, chain: string, tokenSlug: string | undefined, balanceType?: 'transferable' | 'total' | 'keepAlive', extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
+    subscribeBalance(address: string, chain: string, tokenSlug: string | undefined, balanceType?: BalanceType, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     subscribeTransferableBalance(address: string, chain: string, tokenSlug: string | undefined, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     subscribeTotalBalance(address: string, chain: string, tokenSlug: string | undefined, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
+    subscribeBalanceByType(address: string, chain: string, tokenSlug: string | undefined, balanceType?: BalanceType, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     /**
      * @public
      * @async
@@ -64,6 +65,7 @@ export declare class BalanceService implements StoppableServiceInterface {
      */
     getTransferableBalance(address: string, chain: string, tokenSlug?: string, extrinsicType?: ExtrinsicType): Promise<AmountData>;
     getTotalBalance(address: string, chain: string, tokenSlug?: string, extrinsicType?: ExtrinsicType): Promise<AmountData>;
+    getBalanceByType(address: string, chain: string, tokenSlug?: string, balanceType?: BalanceType, extrinsicType?: ExtrinsicType): Promise<AmountData>;
     /** Remove balance from the subject object by addresses */
     removeBalanceByAddresses(addresses: string[]): void;
     /** Remove inactive asset from the balance map */

package/services/balance-service/index.js

@@ -9,6 +9,7 @@ import { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSn
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _getChainNativeTokenSlug, _isCustomAsset, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
+import { BalanceType } from '@subwallet/extension-base/types';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
@@ -18,6 +19,7 @@ import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
+import { _BALANCE_CHAIN_GROUP } from "../chain-service/constants.js";
 import { _isAcrossChainBridge, getAcrossQuote } from "./transfer/xcm/acrossBridge/index.js";
 import { BalanceMapImpl } from "./BalanceMapImpl.js";
 import { subscribeBalance } from "./helpers/index.js";
@@ -175,7 +177,7 @@ export class BalanceService {
   }
 
   /** Subscribe token free balance of an address on chain */
-  async subscribeBalance(address, chain, tokenSlug, balanceType = 'transferable', extrinsicType, callback) {
+  async subscribeBalance(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType, callback) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -208,9 +210,20 @@ export class BalanceService {
         const rs = result[0];
         let value;
         switch (balanceType) {
-          case 'total':
+          case BalanceType.TOTAL:
             value = new BigN(rs.free).plus(new BigN(rs.locked)).toFixed();
             break;
+          case BalanceType.TOTAL_MINUS_RESERVED:
+            if (_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 BigN(rs.free).plus(new BigN(rs.locked)).minus(BigN.max(new BigN(((_rs$lockedDetails = rs.lockedDetails) === null || _rs$lockedDetails === void 0 ? void 0 : _rs$lockedDetails.reserved) || 0), new BigN(((_rs$lockedDetails2 = rs.lockedDetails) === null || _rs$lockedDetails2 === void 0 ? void 0 : _rs$lockedDetails2.staking) || 0))).toFixed();
+            }
+            break;
           default:
             value = rs.free;
         }
@@ -242,10 +255,13 @@ export class BalanceService {
     });
   }
   async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
-    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+    return this.subscribeBalance(address, chain, tokenSlug, 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, BalanceType.TOTAL, extrinsicType, callback);
+  }
+  async subscribeBalanceByType(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, balanceType, extrinsicType, callback);
   }
 
   /**
@@ -267,6 +283,10 @@ export class BalanceService {
     const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getBalanceByType(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType) {
+    const [, balance] = await this.subscribeBalanceByType(address, chain, tokenSlug, balanceType, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {
@@ -452,7 +472,7 @@ export class BalanceService {
       const type = getKeypairTypeByAddress(address);
       const typeValid = [...EthereumKeypairTypes].includes(type);
       if (typeValid) {
-        return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+        return subwalletApiSdk.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
           console.error(e);
           return null;
         });
@@ -632,7 +652,7 @@ export class BalanceService {
   async evmDetectBalanceToken(addresses) {
     const assetMap = this.state.chainService.getAssetRegistry();
     const evmPromiseList = addresses.map(address => {
-      return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+      return subwalletApiSdk.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
         console.error(e);
         return null;
       });

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

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

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

@@ -1,7 +1,6 @@
 import { SingleModeJson } from '@subwallet/extension-base/background/KoniTypes';
 export declare const API_AUTO_CONNECT_MS = 3000;
 export declare const API_CONNECT_TIMEOUT = 30000;
-export declare const API_MAX_RETRY = 2;
 export declare const _API_OPTIONS_CHAIN_GROUP: {
     acala: string[];
     turing: string[];
@@ -22,10 +21,12 @@ export declare const _BALANCE_CHAIN_GROUP: {
     supportBridged: string[];
     bittensor: string[];
     moonbeam: string[];
+    notSupportGetBalanceByType: string[];
 };
-export declare const _BALANCE_TOKEN_GROUP: {
-    crab: string[];
-    bitcountry: string[];
+export declare const _BALANCE_LOCKED_ID_GROUP: {
+    staking: string[];
+    gov: string[];
+    democracy: string[];
 };
 export declare const _NFT_CHAIN_GROUP: {
     acala: string[];
@@ -59,7 +60,6 @@ export interface _SubstrateUniformEraPayoutInflationParams extends _SubstrateInf
 }
 export declare const _SUBSTRATE_DEFAULT_INFLATION_PARAMS: _SubstrateInflationParams;
 export declare const _KNOWN_CHAIN_INFLATION_PARAMS: Record<string, _SubstrateInflationParams>;
-export declare const _TRANSFER_NOT_SUPPORTED_CHAINS: string[];
 export declare const _TRANSFER_CHAIN_GROUP: {
     acala: string[];
     kintsugi: string[];
@@ -74,22 +74,9 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     disable_transfer: string[];
     truth: string[];
 };
-export declare const _BALANCE_PARSING_CHAIN_GROUP: {
-    bobabeam: string[];
-};
 export declare const _MANTA_ZK_CHAIN_GROUP: string[];
 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: {
-    RP: string;
-    PP: string;
-    PR: string;
-};
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
 export declare const EVM_PASS_CONNECT_STATUS: Record<string, string[]>;
 export declare const EVM_REFORMAT_DECIMALS: {
@@ -100,10 +87,4 @@ export declare const _BITCOIN_CHAIN_SLUG = "bitcoin";
 export declare const _BITCOIN_TESTNET_CHAIN_SLUG = "bitcoinTestnet";
 export declare const _BITCOIN_NAME = "Bitcoin";
 export declare const _BITCOIN_TESTNET_NAME = "Bitcoin Testnet";
-export declare const _CHAIN_INFO_SRC: string;
-export declare const _CHAIN_ASSET_SRC: string;
-export declare const _ASSET_REF_SRC: string;
-export declare const _MULTI_CHAIN_ASSET_SRC: string;
-export declare const _CHAIN_LOGO_MAP_SRC: string;
-export declare const _ASSET_LOGO_MAP_SRC: string;
 export declare const _BTC_SERVICE_TOKEN: string;

package/services/chain-service/constants.js

@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _DEFAULT_CHAINS } from '@subwallet/chain-list';
-import { _SubstrateChainType } from '@subwallet/chain-list/types';
 import { ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
 export const API_AUTO_CONNECT_MS = 3000;
 export const API_CONNECT_TIMEOUT = 30000;
-export const API_MAX_RETRY = 2;
 export const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
   turing: ['turingStaging', 'turing'],
@@ -36,11 +34,13 @@ export 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']
 };
-export const _BALANCE_TOKEN_GROUP = {
-  crab: ['CKTON', 'PKTON'],
-  bitcountry: ['BIT']
+export const _BALANCE_LOCKED_ID_GROUP = {
+  staking: ['staking', 'delegatedStaking', 'pooledStaking', 'stkngdel', 'stk_stks', 'dappStaking', 'parachainStaking', 'appstakeappstake', 'collatorStaking'],
+  gov: ['pyconvot'],
+  democracy: ['democrac']
 };
 export const _NFT_CHAIN_GROUP = {
   acala: ['acala'],
@@ -274,12 +274,10 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
 
 // Send fund------------------------------------------------------------------------------------------------------------
 
-export const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
 export 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'],
@@ -290,30 +288,12 @@ export const _TRANSFER_CHAIN_GROUP = {
   disable_transfer: ['crab', 'pangolin'],
   truth: ['truth_network']
 };
-export const _BALANCE_PARSING_CHAIN_GROUP = {
-  bobabeam: ['bobabeam', 'bobabase']
-};
 export const _MANTA_ZK_CHAIN_GROUP = ['calamari'];
 export const _ZK_ASSET_PREFIX = 'zk';
 export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 
 // XCM------------------------------------------------------------------------------------------------------------------
 
-export 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
-};
-
-export const _XCM_TYPE = {
-  RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
-  // DMP
-  PP: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.PARACHAIN}`,
-  // HRMP
-  PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
-};
-
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network', 'ton'];
 export const EVM_PASS_CONNECT_STATUS = {
   arbitrum_one: ['*'],
@@ -326,17 +306,8 @@ export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
 export const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
-
-// TODO: review
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 export const _BITCOIN_CHAIN_SLUG = 'bitcoin';
 export const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet';
 export const _BITCOIN_NAME = 'Bitcoin';
 export const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet';
-export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
-export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
-export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
-export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
-export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
-export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
 export const _BTC_SERVICE_TOKEN = process.env.BTC_SERVICE_TOKEN || '';

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

@@ -118,6 +118,9 @@ export class EvmChainHandler extends AbstractChainHandler {
         tokenContract.methods.symbol().call()]);
         name = _name;
         symbol = _symbol;
+        if (name === '') {
+          contractError = true;
+        }
       } else {
         tokenContract = new evmApi.api.eth.Contract(_ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
@@ -130,9 +133,9 @@ export class EvmChainHandler extends AbstractChainHandler {
         name = _name;
         decimals = new BigN(_decimals).toNumber();
         symbol = _symbol;
-      }
-      if (name === '' || symbol === '') {
-        contractError = true;
+        if (name === '' || symbol === '') {
+          contractError = true;
+        }
       }
       return {
         name,