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

package/koni/background/handlers/Extension.js

@@ -47,7 +47,7 @@ import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setti
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
-import { AccountChainType, AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountSignMode, BalanceType, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -1144,6 +1144,9 @@ export default class KoniExtension {
     });
     return this.getNft();
   }
+  async handleGetNftFullList(request) {
+    return this.#koniState.nftDetectionService.getFullNftInstancesByCollection(request);
+  }
   getStakingReward() {
     return new Promise((resolve, reject) => {
       this.#koniState.getStakingReward(rs => {
@@ -1644,7 +1647,7 @@ export default class KoniExtension {
           error.length && inputTransaction.errors.push(...error);
         }
         if (isSubstrateXcm) {
-          const isDryRunSuccess = await dryRunXcmExtrinsicV2(params);
+          const isDryRunSuccess = await dryRunXcmExtrinsicV2(params, false);
           if (!isDryRunSuccess) {
             inputTransaction.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
           }
@@ -2033,20 +2036,40 @@ export default class KoniExtension {
     var _data$metadata;
     const evmApi = this.#koniState.getEvmApi(data.originChain);
     const contractAddress = (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress;
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const tokenContract = new evmApi.api.eth.Contract(_ERC721_ABI, contractAddress);
     try {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-      await tokenContract.methods.tokenOfOwnerByIndex('0xB7fdD27a8Df011816205a6e3cAA097DC4D8C2C5d', 1).call();
-      return true;
-    } catch (err) {
-      const error = err;
-      if (error.message.includes('index out of bounds')) {
-        return true;
-      } else {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const supports1155 = await tokenContract.methods.supportsInterface('0xd9b67a26').call().catch(() => false);
+      if (supports1155) {
         return false;
       }
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const supports721 = await tokenContract.methods.supportsInterface('0x80ac58cd').call().catch(() => false);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const supportsMetadata = await tokenContract.methods.supportsInterface('0x5b5e139f').call().catch(() => false);
+      if (supports721 || supportsMetadata) {
+        return true;
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      if (tokenContract.methods.ownerOf) {
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+          await tokenContract.methods.ownerOf(1).call();
+          return true;
+        } catch (err) {
+          var _err$message, _err$message2;
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+          if ((_err$message = err.message) !== null && _err$message !== void 0 && _err$message.includes('nonexistent token') || (_err$message2 = err.message) !== null && _err$message2 !== void 0 && _err$message2.includes('invalid token ID')) {
+            return true;
+          }
+        }
+      }
+      return false;
+    } catch (err) {
+      const error = err;
+      return error.message.includes('index out of bounds');
     }
   }
   async upsertCustomToken(data) {
@@ -2102,6 +2125,21 @@ export default class KoniExtension {
     }
     return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
+  async getAddressAvailableBalanceByType({
+    address,
+    balanceType,
+    extrinsicType,
+    networkKey,
+    token
+  }) {
+    if (token && _MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
+      const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
+      if (tokenInfo.symbol.startsWith(_ZK_ASSET_PREFIX)) {
+        return await this.#koniState.getMantaPayZkBalance(address, tokenInfo);
+      }
+    }
+    return await this.#koniState.balanceService.getBalanceByType(address, networkKey, token, balanceType, extrinsicType);
+  }
   async getAddressTotalBalance({
     address,
     extrinsicType,
@@ -2173,7 +2211,7 @@ export default class KoniExtension {
     });
     const [unsubBalance, freeBalance] = await (async () => {
       try {
-        return await this.#koniState.balanceService.subscribeBalance(address, chain, token, 'transferable', extrinsicType, data => {
+        return await this.#koniState.balanceService.subscribeBalance(address, chain, token, BalanceType.TRANSFERABLE, extrinsicType, data => {
           freeBalanceSubject.next(data); // Must be called after subscription
         });
       } catch (e) {
@@ -2311,7 +2349,7 @@ export default class KoniExtension {
         convertData(freeBalance, fee, _feeOptions, feeCustom).then(cb).catch(console.error);
       }
     });
-    const [unsubBalance, freeBalance] = await this.#koniState.balanceService.subscribeBalance(address, chain, token, 'transferable', ExtrinsicType.TRANSFER_BALANCE, data => {
+    const [unsubBalance, freeBalance] = await this.#koniState.balanceService.subscribeBalance(address, chain, token, BalanceType.TRANSFERABLE, ExtrinsicType.TRANSFER_BALANCE, data => {
       freeBalanceSubject.next(data); // Must be called after subscription
     });
 
@@ -2354,6 +2392,31 @@ export default class KoniExtension {
     });
     return convertData(currentFreeBalance);
   }
+  async subscribeAddressAvailableBalanceByType({
+    address,
+    balanceType,
+    extrinsicType,
+    networkKey,
+    token
+  }, id, port) {
+    const cb = createSubscription(id, port);
+    const convertData = data => {
+      return {
+        ...data,
+        id
+      };
+    };
+    const _cb = data => {
+      // eslint-disable-next-line node/no-callback-literal
+      cb(convertData(data));
+    };
+    const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeBalanceByType(address, networkKey, token, balanceType, extrinsicType, _cb);
+    this.createUnsubscriptionHandle(id, unsub);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return convertData(currentFreeBalance);
+  }
   async substrateNftSubmitTransaction(inputData) {
     const {
       params,
@@ -3799,6 +3862,10 @@ export default class KoniExtension {
         });
       }
     }
+    let balanceTypeForPool = BalanceType.TRANSFERABLE;
+    if (!!poolHandler && [YieldPoolType.NATIVE_STAKING, YieldPoolType.NOMINATION_POOL].includes(poolHandler.type)) {
+      balanceTypeForPool = BalanceType.TOTAL_MINUS_RESERVED;
+    }
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: txChain,
@@ -3810,6 +3877,7 @@ export default class KoniExtension {
       chainType,
       resolveOnDone: !isLastStep,
       transferNativeAmount,
+      balanceType: balanceTypeForPool,
       skipFeeValidation: isMintingStep && isPoolSupportAlternativeFee,
       errorOnTimeOut,
       ...this.createPassConfirmationParams(isPassConfirmation),
@@ -4807,6 +4875,8 @@ export default class KoniExtension {
         return await this.getNftCollection();
       case 'pri(nftCollection.getSubscription)':
         return await this.subscribeNftCollection(id, port);
+      case 'pri(nft.getFullList)':
+        return await this.handleGetNftFullList(request);
       case 'pri(staking.getStaking)':
         return this.getStaking();
       case 'pri(staking.getSubscription)':
@@ -5015,6 +5085,10 @@ export default class KoniExtension {
         return this.getAddressTransferableBalance(request);
       case 'pri(freeBalance.subscribe)':
         return this.subscribeAddressTransferableBalance(request, id, port);
+      case 'pri(availableBalance.getBalanceByType)':
+        return this.getAddressAvailableBalanceByType(request);
+      case 'pri(availableBalance.subscribeBalanceByType)':
+        return this.subscribeAddressAvailableBalanceByType(request, id, port);
       case 'pri(subscription.cancel)':
         return this.cancelSubscription(request);
       case 'pri(chainService.recoverSubstrateApi)':

package/koni/background/handlers/State.d.ts

@@ -19,6 +19,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';
@@ -73,6 +74,7 @@ export default class KoniState {
     readonly mintCampaignService: MintCampaignService;
     readonly campaignService: CampaignService;
     readonly mktCampaignService: MktCampaignService;
+    readonly nftDetectionService: NftService;
     readonly buyService: BuyService;
     readonly earningService: EarningService;
     readonly feeService: FeeService;
@@ -133,6 +135,8 @@ export default class KoniState {
     resetNft(newAddress: string): void;
     updateNftData(network: string, nftData: NftItem, address: string, callback?: (nftData: NftItem) => void): void;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
+    handleDetectedNfts(address: string, nftItems: NftItem[]): Promise<void>;
+    handleDetectedNftCollections(collections: NftCollection[]): Promise<void>;
     cleanUpNfts(chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean): void;
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;

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.66-0",
+  "version": "1.3.68-0",
   "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",
@@ -799,11 +804,6 @@
       "require": "./cjs/services/balance-service/transfer/xcm/availBridge.js",
       "default": "./services/balance-service/transfer/xcm/availBridge.js"
     },
-    "./services/balance-service/transfer/xcm/polkadotXcm": {
-      "types": "./services/balance-service/transfer/xcm/polkadotXcm.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/polkadotXcm.js",
-      "default": "./services/balance-service/transfer/xcm/polkadotXcm.js"
-    },
     "./services/balance-service/transfer/xcm/polygonBridge": {
       "types": "./services/balance-service/transfer/xcm/polygonBridge.d.ts",
       "require": "./cjs/services/balance-service/transfer/xcm/polygonBridge.js",
@@ -824,16 +824,6 @@
       "require": "./cjs/services/balance-service/transfer/xcm/utils.js",
       "default": "./services/balance-service/transfer/xcm/utils.js"
     },
-    "./services/balance-service/transfer/xcm/xcmPallet": {
-      "types": "./services/balance-service/transfer/xcm/xcmPallet.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/xcmPallet.js",
-      "default": "./services/balance-service/transfer/xcm/xcmPallet.js"
-    },
-    "./services/balance-service/transfer/xcm/xTokens": {
-      "types": "./services/balance-service/transfer/xcm/xTokens.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/xTokens.js",
-      "default": "./services/balance-service/transfer/xcm/xTokens.js"
-    },
     "./services/base/types": {
       "types": "./services/base/types.d.ts",
       "require": "./cjs/services/base/types.js",
@@ -1721,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",
@@ -2922,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.66-0",
-    "@subwallet/extension-chains": "^1.3.66-0",
-    "@subwallet/extension-dapp": "^1.3.66-0",
-    "@subwallet/extension-inject": "^1.3.66-0",
+    "@subwallet/extension-base": "^1.3.68-0",
+    "@subwallet/extension-chains": "^1.3.68-0",
+    "@subwallet/extension-dapp": "^1.3.68-0",
+    "@subwallet/extension-inject": "^1.3.68-0",
     "@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.66-0'
+  version: '1.3.68-0'
 };

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 */