@subwallet/extension-base 1.3.16-0 → 1.3.17-0

package/background/KoniTypes.d.ts

@@ -1300,6 +1300,10 @@ export interface RequestAddPspToken {
         logo?: string;
     };
 }
+export interface TokenPriorityDetails {
+    tokenGroup: Record<string, number>;
+    token: Record<string, number>;
+}
 export interface RequestConnectWalletConnect {
     uri: string;
 }
@@ -1701,6 +1705,7 @@ export interface KoniRequestSignatures {
     'pri(availBridge.submitClaimAvailBridgeOnAvail)': [RequestClaimBridge, SWTransactionResponse];
     'pri(polygonBridge.submitClaimPolygonBridge)': [RequestClaimBridge, SWTransactionResponse];
     'pri(ledger.generic.allow)': [null, string[], string[]];
+    'pri(tokens.subscribePriority)': [null, TokenPriorityDetails, TokenPriorityDetails];
 }
 export interface ApplicationMetadataType {
     version: string;

package/cjs/koni/api/staking/bonding/utils.js

@@ -395,7 +395,7 @@ function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
 function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liveDay) {
   const maxSupportDay = Math.floor(maxSupportedEras / erasPerDay);
   if (liveDay && liveDay <= 30) {
-    return Math.min(liveDay - 1, maxSupportDay);
+    return Math.min(Math.floor(liveDay - 1), maxSupportDay);
   }
   if (maxSupportDay > 30) {
     return 30;

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

@@ -1609,7 +1609,6 @@ class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
-    const existentialDeposit = originTokenInfo.minAmount || '0';
 
     // todo: improve this case. Currently set 1 AVAIL for covering fee as default.
     const isSpecialBridgeFromAvail = originTokenInfo.slug === 'avail_mainnet-NATIVE-AVAIL' && destChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM;
@@ -1624,8 +1623,8 @@ class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new _bignumber.default(value);
-      const estimatedFee = isSpecialBridgeFromAvail ? specialBridgeFromAvailFee : bnMockExecutionFee.multipliedBy(_constants.XCM_FEE_RATIO).plus(new _bignumber.default(existentialDeposit));
-      return bnMaxTransferable.minus(estimatedFee);
+      const txFee = isSpecialBridgeFromAvail ? specialBridgeFromAvailFee : bnMockExecutionFee.multipliedBy(_constants.XCM_FEE_RATIO);
+      return bnMaxTransferable.minus(txFee);
     }
     return new _bignumber.default(0);
   }
@@ -3516,6 +3515,20 @@ class KoniExtension {
 
   /* Ledger */
 
+  /* Popular tokens */
+
+  subscribePriorityTokens(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.chainService.observable.priorityTokens.subscribe(cb);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.value.priorityTokens;
+  }
+
+  /* Popular tokens */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4107,6 +4120,12 @@ class KoniExtension {
       case 'pri(ledger.generic.allow)':
         return this.subscribeLedgerGenericAllowChains(id, port);
       /* Ledger */
+
+      /* Priority tokens */
+      case 'pri(tokens.subscribePriority)':
+        return this.subscribePriorityTokens(id, port);
+      /* Priority tokens */
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

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.16-0'
+  version: '1.3.17-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -19,6 +19,7 @@ var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _tao = require("@subwallet/extension-base/services/earning-service/handlers/native-staking/tao");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _evm = require("../evm");
@@ -141,7 +142,18 @@ const subscribeWithSystemAccountPallet = async _ref => {
   let bittensorStakingBalances = new Array(addresses.length).fill(new _bignumber.default(0));
   if (['bittensor'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
-      const TaoTotalStake = await substrateApi.api.query.subtensorModule.totalColdkeyStake(address);
+      const stakeInfo = (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON();
+      const price = await (0, _tao.getTaoToAlphaMapping)(substrateApi);
+      let TaoTotalStake = new _bignumber.default(0);
+      if (stakeInfo) {
+        for (const validator of Object.values(stakeInfo)) {
+          const stake = new _bignumber.default(validator.stake);
+          const netuid = validator.netuid;
+          const taoToAlphaPrice = price[netuid] ? new _bignumber.default(price[netuid]) : new _bignumber.default(1);
+          const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+          TaoTotalStake = TaoTotalStake.plus(taoStake);
+        }
+      }
       return new _bignumber.default(TaoTotalStake.toString());
     }));
   }

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

@@ -61,6 +61,7 @@ class ChainService {
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
   ledgerGenericAllowChainsSubject = new _rxjs.BehaviorSubject([]);
+  priorityTokensSubject = new _rxjs.BehaviorSubject({});
 
   // Todo: Update to new store indexed DB
   store = new _AssetSetting.default();
@@ -84,17 +85,25 @@ class ChainService {
   }
   get value() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.value;
+      },
+      get priorityTokens() {
+        return priorityTokens.value;
       }
     };
   }
   get observable() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.asObservable();
+      },
+      get priorityTokens() {
+        return priorityTokens.asObservable();
       }
     };
   }
@@ -605,6 +614,10 @@ class ChainService {
     this.eventService.emit('ledger.ready', true);
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
+  handleLatestPriorityTokens(latestPriorityTokens) {
+    this.priorityTokensSubject.next(latestPriorityTokens);
+    this.logger.log('Finished updating latest popular tokens');
+  }
   handleLatestData() {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.lockChainInfoMap = true; // do not need to check current lockChainInfoMap because all remains action is fast enough and don't affect this feature.
@@ -622,6 +635,9 @@ class ChainService {
     this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
       this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
     }).catch(console.error);
+    this.fetchLatestPriorityTokens().then(latestPriorityTokens => {
+      this.handleLatestPriorityTokens(latestPriorityTokens);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -885,6 +901,12 @@ class ChainService {
   async fetchLatestLedgerGenericAllowChains() {
     return (await (0, _utils2.fetchStaticData)('chains/ledger-generic-allow-chains')) || [];
   }
+  async fetchLatestPriorityTokens() {
+    return (await (0, _utils2.fetchStaticData)('chain-assets/priority-tokens')) || {
+      tokenGroup: {},
+      token: {}
+    };
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap, ignoredList);

package/cjs/services/earning-service/handlers/native-staking/tao.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.bittensorApiKey = exports.BITTENSOR_API_KEY_9 = exports.BITTENSOR_API_KEY_8 = exports.BITTENSOR_API_KEY_7 = exports.BITTENSOR_API_KEY_6 = exports.BITTENSOR_API_KEY_5 = exports.BITTENSOR_API_KEY_4 = exports.BITTENSOR_API_KEY_3 = exports.BITTENSOR_API_KEY_2 = exports.BITTENSOR_API_KEY_10 = exports.BITTENSOR_API_KEY_1 = void 0;
 exports.fetchDelegates = fetchDelegates;
-exports.fetchTaoDelegateState = fetchTaoDelegateState;
+exports.getTaoToAlphaMapping = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -20,6 +20,26 @@ var _utils3 = require("../../utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const getTaoToAlphaMapping = async substrateApi => {
+  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
+  if (!allSubnets) {
+    return {};
+  }
+  return allSubnets.reduce((acc, subnet) => {
+    const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new _bignumber.default(subnet.taoIn) : new _bignumber.default(0);
+    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new _bignumber.default(subnet.alphaIn) : new _bignumber.default(0);
+    if (netuid === 0) {
+      acc[netuid] = '1';
+    } else if (alphaIn.gt(0)) {
+      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
+    } else {
+      acc[netuid] = '1';
+    }
+    return acc;
+  }, {});
+};
+exports.getTaoToAlphaMapping = getTaoToAlphaMapping;
 const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
 exports.BITTENSOR_API_KEY_1 = BITTENSOR_API_KEY_1;
 const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
@@ -49,7 +69,7 @@ function random() {
   return validKeys[randomIndex];
 }
 const bittensorApiKey = () => {
-  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6);
+  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6, BITTENSOR_API_KEY_7, BITTENSOR_API_KEY_8, BITTENSOR_API_KEY_9, BITTENSOR_API_KEY_10);
 };
 
 /* Fetch data */
@@ -68,20 +88,22 @@ async function fetchDelegates() {
     }).catch(console.error);
   });
 }
-async function fetchTaoDelegateState(address) {
-  const apiKey = bittensorApiKey();
-  return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `${apiKey}`
-      }
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
-}
+
+// export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {
+//   const apiKey = bittensorApiKey();
+
+//   return new Promise(function (resolve) {
+//     fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
+//       method: 'GET',
+//       headers: {
+//         'Content-Type': 'application/json',
+//         Authorization: `${apiKey}`
+//       }
+//     }).then((resp) => {
+//       resolve(resp.json());
+//     }).catch(console.error);
+//   });
+// }
 
 /* Fetch data */
 
@@ -182,11 +204,12 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake,
-          validatorIdentity: delegate.identity
+          validatorMinStake: minDelegatorStake
+          // validatorIdentity: delegate.identity
         });
       }
     }
+
     const stakingStatus = (0, _utils.getEarningStatusByNominations)(allActiveStake, nominationList);
     return {
       status: stakingStatus,
@@ -214,9 +237,10 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString(),
-          identity: testnetAddress
+          amount: bnStakeAmount.toString()
+          // identity: testnetAddress
         });
+
         rsCallback({
           ...defaultInfo,
           type: this.type,
@@ -239,20 +263,32 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       await Promise.all(stakePromises);
     };
     const getMainnetPoolPosition = async () => {
-      const rawDelegateStateInfos = await Promise.all(useAddresses.map(address => fetchTaoDelegateState(address)));
-      if (rawDelegateStateInfos.length > 0) {
+      const rawDelegateStateInfos = await Promise.all(useAddresses.map(async address => (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON()));
+      const price = await getTaoToAlphaMapping(this.substrateApi);
+      if (rawDelegateStateInfos && rawDelegateStateInfos.length > 0) {
         rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
           const owner = (0, _utils2.reformatAddress)(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = _util.BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.data;
+          const delegateStateInfo = rawDelegateStateInfo;
+          const totalDelegate = {};
           for (const delegate of delegateStateInfo) {
-            const name = delegate.hotkey_name || delegate.hotkey.ss58;
-            bnTotalBalance = bnTotalBalance.add(new _util.BN(delegate.stake));
+            const hotkey = delegate.hotkey;
+            const netuid = delegate.netuid;
+            const stake = new _bignumber.default(delegate.stake);
+            const taoToAlphaPrice = price[netuid] ? new _bignumber.default(price[netuid]) : new _bignumber.default(1);
+            const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+            if (totalDelegate[hotkey]) {
+              totalDelegate[hotkey] = new _bignumber.default(totalDelegate[hotkey]).plus(taoStake).toString();
+            } else {
+              totalDelegate[hotkey] = taoStake;
+            }
+          }
+          for (const hotkey in totalDelegate) {
+            bnTotalBalance = bnTotalBalance.add(new _util.BN(totalDelegate[hotkey]));
             delegatorState.push({
-              owner: delegate.hotkey.ss58,
-              amount: delegate.stake,
-              identity: name
+              owner: hotkey,
+              amount: totalDelegate[hotkey]
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {
@@ -282,6 +318,61 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         });
       }
     };
+
+    // const getMainnetPoolPosition = async () => {
+    //   const rawDelegateStateInfos = await Promise.all(
+    //     useAddresses.map((address) => fetchTaoDelegateState(address))
+    //   );
+
+    //   if (rawDelegateStateInfos.length > 0) {
+    //     rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
+    //       const owner = reformatAddress(useAddresses[i], 42);
+    //       const delegatorState: TaoStakingStakeOption[] = [];
+    //       let bnTotalBalance = BN_ZERO;
+    //       const delegateStateInfo = rawDelegateStateInfo.data;
+
+    //       for (const delegate of delegateStateInfo) {
+    //         const name = delegate.hotkey_name || delegate.hotkey.ss58;
+
+    //         bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+
+    //         delegatorState.push({
+    //           owner: delegate.hotkey.ss58,
+    //           amount: delegate.stake,
+    //           identity: name
+    //         });
+    //       }
+
+    //       if (delegateStateInfo && delegateStateInfo.length > 0) {
+    //         this.parseNominatorMetadata(chainInfo, owner, delegatorState)
+    //           .then((nominatorMetadata) => {
+    //             rsCallback({
+    //               ...defaultInfo,
+    //               ...nominatorMetadata,
+    //               address: owner,
+    //               type: this.type
+    //             });
+    //           })
+    //           .catch(console.error);
+    //       } else {
+    //         rsCallback({
+    //           ...defaultInfo,
+    //           type: this.type,
+    //           address: owner,
+    //           balanceToken: this.nativeToken.slug,
+    //           totalStake: '0',
+    //           activeStake: '0',
+    //           unstakeBalance: '0',
+    //           status: EarningStatus.NOT_STAKING,
+    //           isBondedBefore: false,
+    //           nominations: [],
+    //           unstakings: []
+    //         });
+    //       }
+    //     });
+    //   }
+    // };
+
     const getStakingPositionInterval = async () => {
       if (cancel) {
         return;
@@ -387,7 +478,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const binaryAmount = new _util.BN(amount);
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, binaryAmount);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -405,7 +496,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     if (!selectedTarget || !poolPosition) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount);
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -91,7 +91,7 @@ class NominationPoolHandler extends _base.default {
 
       const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays.toString()).keys()].map(i => i + startEra))]);
+      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);

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

@@ -80,17 +80,27 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       value: '0'
     }), this.state.balanceService.getTransferableBalance(request.address, feeAssetInfo.originChain, feeAssetInfo.slug)]);
     const bnInputAssetBalance = new _util.BN(inputAssetBalance.value);
-    const bnAltInputAssetBalance = new _util.BN(altInputAssetBalance.value);
     const bnMinJoinPool = new _util.BN(poolInfo.statistic.earningThreshold.join);
     const inputTokenInfo = this.state.chainService.getAssetBySlug(this.inputAsset);
     const altInputTokenInfo = this.state.chainService.getAssetBySlug(this.altInputAsset);
+    const existentialDeposit = new _util.BN((0, _utils2._getAssetExistentialDeposit)(altInputTokenInfo));
+    const bnAltInputAssetBalance = new _util.BN(altInputAssetBalance.value);
     if (bnInputAssetBalance.add(bnAltInputAssetBalance).lt(bnMinJoinPool)) {
+      const missingAmount = bnMinJoinPool.sub(bnInputAssetBalance).sub(bnAltInputAssetBalance);
+      const isTheSame = missingAmount.toString() === bnMinJoinPool.toString();
       const originChain = this.state.getChainInfo(inputTokenInfo.originChain);
       const altChain = this.state.getChainInfo(altInputTokenInfo.originChain);
-      const parsedMinJoinPool = (0, _utils3.formatNumber)(bnMinJoinPool.toString(), inputAssetInfo.decimals || 0);
+      const originSymbol = (0, _utils2._getAssetSymbol)(inputTokenInfo);
+      const altSymbol = (0, _utils2._getAssetSymbol)(altInputTokenInfo);
+      const originName = originChain.name;
+      const altName = altChain.name;
+      const parsedMinJoinPool = (0, _utils3.formatNumber)(missingAmount.toString(), inputAssetInfo.decimals || 0);
+      const formatparsedMinJoinPool = isTheSame ? parsedMinJoinPool : Number(parsedMinJoinPool) + 0.01;
+      const parsedMinAltJoinPool = (0, _utils3.formatNumber)(missingAmount.add(existentialDeposit).toString(), inputAssetInfo.decimals || 0);
+      const formatParsedMinAltJoinPool = isTheSame ? parsedMinAltJoinPool : Number(parsedMinAltJoinPool) + 0.01;
       return {
         passed: false,
-        errorMessage: `You need at least ${parsedMinJoinPool} ${inputTokenInfo.symbol} (${originChain.name}) or ${altInputTokenInfo.symbol} (${altChain.name}) to start earning`
+        errorMessage: `You need to deposit an additional ${formatparsedMinJoinPool} ${originSymbol} (${originName}) or ${formatParsedMinAltJoinPool} ${altSymbol} (${altName}) to start earning`
       };
     }
     if (this.feeAssets.length === 1) {
@@ -288,16 +298,15 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
+      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee.mul(new _util.BN(_constants.XCM_FEE_RATIO)));
+      const inputTokenDecimal = (0, _utils2._getAssetDecimals)(inputTokenInfo);
       const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
-      const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
-      const symbol = altInputTokenInfo.symbol;
-      const altNetwork = this.state.getChainInfo(altInputTokenInfo.originChain);
+      const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenDecimal);
+      const symbol = (0, _utils2._getAssetSymbol)(altInputTokenInfo);
       const inputNetworkName = this.chainInfo.name;
-      const altNetworkName = altNetwork.name;
-      const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
-      const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
+      const altNetworkName = (0, _utils2._getAssetName)(altInputTokenInfo);
+      const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenDecimal);
       processValidation.message = (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
           symbol,

package/koni/api/staking/bonding/utils.js

@@ -352,7 +352,7 @@ export function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
 export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liveDay) {
   const maxSupportDay = Math.floor(maxSupportedEras / erasPerDay);
   if (liveDay && liveDay <= 30) {
-    return Math.min(liveDay - 1, maxSupportDay);
+    return Math.min(Math.floor(liveDay - 1), maxSupportDay);
   }
   if (maxSupportDay > 30) {
     return 30;

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

@@ -262,5 +262,6 @@ export default class KoniExtension {
     private getIsClaimedPolygonBridge;
     private submitClaimPolygonBridge;
     private subscribeLedgerGenericAllowChains;
+    private subscribePriorityTokens;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -1564,7 +1564,6 @@ export default class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
-    const existentialDeposit = originTokenInfo.minAmount || '0';
 
     // todo: improve this case. Currently set 1 AVAIL for covering fee as default.
     const isSpecialBridgeFromAvail = originTokenInfo.slug === 'avail_mainnet-NATIVE-AVAIL' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM;
@@ -1579,8 +1578,8 @@ export default class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new BigN(value);
-      const estimatedFee = isSpecialBridgeFromAvail ? specialBridgeFromAvailFee : bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
-      return bnMaxTransferable.minus(estimatedFee);
+      const txFee = isSpecialBridgeFromAvail ? specialBridgeFromAvailFee : bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO);
+      return bnMaxTransferable.minus(txFee);
     }
     return new BigN(0);
   }
@@ -3438,6 +3437,20 @@ export default class KoniExtension {
 
   /* Ledger */
 
+  /* Popular tokens */
+
+  subscribePriorityTokens(id, port) {
+    const cb = createSubscription(id, port);
+    const subscription = this.#koniState.chainService.observable.priorityTokens.subscribe(cb);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.value.priorityTokens;
+  }
+
+  /* Popular tokens */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4029,6 +4042,12 @@ export default class KoniExtension {
       case 'pri(ledger.generic.allow)':
         return this.subscribeLedgerGenericAllowChains(id, port);
       /* Ledger */
+
+      /* Priority tokens */
+      case 'pri(tokens.subscribePriority)':
+        return this.subscribePriorityTokens(id, port);
+      /* Priority tokens */
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.16-0",
+  "version": "1.3.17-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2514,10 +2514,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.99-beta.14",
-    "@subwallet/extension-base": "^1.3.16-0",
-    "@subwallet/extension-chains": "^1.3.16-0",
-    "@subwallet/extension-dapp": "^1.3.16-0",
-    "@subwallet/extension-inject": "^1.3.16-0",
+    "@subwallet/extension-base": "^1.3.17-0",
+    "@subwallet/extension-chains": "^1.3.17-0",
+    "@subwallet/extension-dapp": "^1.3.17-0",
+    "@subwallet/extension-inject": "^1.3.17-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@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.16-0'
+  version: '1.3.17-0'
 };

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

@@ -15,6 +15,7 @@ import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/cont
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getAssetExistentialDeposit, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { getTaoToAlphaMapping } from '@subwallet/extension-base/services/earning-service/handlers/native-staking/tao';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { subscribeERC20Interval } from "../evm.js";
@@ -132,7 +133,18 @@ const subscribeWithSystemAccountPallet = async ({
   let bittensorStakingBalances = new Array(addresses.length).fill(new BigN(0));
   if (['bittensor'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
-      const TaoTotalStake = await substrateApi.api.query.subtensorModule.totalColdkeyStake(address);
+      const stakeInfo = (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON();
+      const price = await getTaoToAlphaMapping(substrateApi);
+      let TaoTotalStake = new BigN(0);
+      if (stakeInfo) {
+        for (const validator of Object.values(stakeInfo)) {
+          const stake = new BigN(validator.stake);
+          const netuid = validator.netuid;
+          const taoToAlphaPrice = price[netuid] ? new BigN(price[netuid]) : new BigN(1);
+          const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+          TaoTotalStake = TaoTotalStake.plus(taoStake);
+        }
+      }
       return new BigN(TaoTotalStake.toString());
     }));
   }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AssetSetting, MetadataItem, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { AssetSetting, MetadataItem, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -30,15 +30,18 @@ export declare class ChainService {
     private assetLogoMapSubject;
     private chainLogoMapSubject;
     private ledgerGenericAllowChainsSubject;
+    private priorityTokensSubject;
     private store;
     private assetSettingSubject;
     private logger;
     constructor(dbService: DatabaseService, eventService: EventService);
     get value(): {
         readonly ledgerGenericAllowChains: string[];
+        readonly priorityTokens: TokenPriorityDetails;
     };
     get observable(): {
         readonly ledgerGenericAllowChains: import("rxjs").Observable<string[]>;
+        readonly priorityTokens: import("rxjs").Observable<TokenPriorityDetails>;
     };
     subscribeSwapRefMap(): Subject<Record<string, _AssetRef>>;
     get xcmRefMap(): Record<string, _AssetRef>;
@@ -105,6 +108,7 @@ export declare class ChainService {
     handleLatestChainData(latestChainInfo: _ChainInfo[]): void;
     autoEnableTokens(): Promise<void>;
     handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains: string[]): void;
+    handleLatestPriorityTokens(latestPriorityTokens: TokenPriorityDetails): void;
     handleLatestData(): void;
     private initApis;
     initSingleApi(slug: string): Promise<boolean>;
@@ -118,6 +122,7 @@ export declare class ChainService {
     private fetchLatestChainData;
     private fetchLatestPriceIdsData;
     private fetchLatestLedgerGenericAllowChains;
+    private fetchLatestPriorityTokens;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;

package/services/chain-service/index.js

@@ -47,6 +47,7 @@ export class ChainService {
   assetLogoMapSubject = new BehaviorSubject(AssetLogoMap);
   chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
   ledgerGenericAllowChainsSubject = new BehaviorSubject([]);
+  priorityTokensSubject = new BehaviorSubject({});
 
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
@@ -70,17 +71,25 @@ export class ChainService {
   }
   get value() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.value;
+      },
+      get priorityTokens() {
+        return priorityTokens.value;
       }
     };
   }
   get observable() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.asObservable();
+      },
+      get priorityTokens() {
+        return priorityTokens.asObservable();
       }
     };
   }
@@ -581,6 +590,10 @@ export class ChainService {
     this.eventService.emit('ledger.ready', true);
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
+  handleLatestPriorityTokens(latestPriorityTokens) {
+    this.priorityTokensSubject.next(latestPriorityTokens);
+    this.logger.log('Finished updating latest popular tokens');
+  }
   handleLatestData() {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.lockChainInfoMap = true; // do not need to check current lockChainInfoMap because all remains action is fast enough and don't affect this feature.
@@ -598,6 +611,9 @@ export class ChainService {
     this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
       this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
     }).catch(console.error);
+    this.fetchLatestPriorityTokens().then(latestPriorityTokens => {
+      this.handleLatestPriorityTokens(latestPriorityTokens);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -859,6 +875,12 @@ export class ChainService {
   async fetchLatestLedgerGenericAllowChains() {
     return (await fetchStaticData('chains/ledger-generic-allow-chains')) || [];
   }
+  async fetchLatestPriorityTokens() {
+    return (await fetchStaticData('chain-assets/priority-tokens')) || {
+      tokenGroup: {},
+      token: {}
+    };
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap, ignoredList);

package/services/earning-service/handlers/native-staking/tao.d.ts

@@ -1,11 +1,16 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BaseYieldPositionInfo, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+export interface TaoStakeInfo {
+    hotkey: string;
+    stake: string;
+    netuid: number;
+}
 interface TaoStakingStakeOption {
     owner: string;
     amount: string;
-    identity: string;
 }
 export interface RawDelegateState {
     data: Array<{
@@ -30,6 +35,7 @@ interface Validator {
     take: string;
     apr: string;
 }
+export declare const getTaoToAlphaMapping: (substrateApi: _SubstrateApi) => Promise<Record<number, string>>;
 export declare const BITTENSOR_API_KEY_1: string;
 export declare const BITTENSOR_API_KEY_2: string;
 export declare const BITTENSOR_API_KEY_3: string;
@@ -42,7 +48,6 @@ export declare const BITTENSOR_API_KEY_9: string;
 export declare const BITTENSOR_API_KEY_10: string;
 export declare const bittensorApiKey: () => string;
 export declare function fetchDelegates(): Promise<ValidatorResponse>;
-export declare function fetchTaoDelegateState(address: string): Promise<RawDelegateState>;
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;

package/services/earning-service/handlers/native-staking/tao.js

@@ -11,6 +11,25 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { calculateReward } from "../../utils/index.js";
+export const getTaoToAlphaMapping = async substrateApi => {
+  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
+  if (!allSubnets) {
+    return {};
+  }
+  return allSubnets.reduce((acc, subnet) => {
+    const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new BigN(subnet.taoIn) : new BigN(0);
+    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new BigN(subnet.alphaIn) : new BigN(0);
+    if (netuid === 0) {
+      acc[netuid] = '1';
+    } else if (alphaIn.gt(0)) {
+      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
+    } else {
+      acc[netuid] = '1';
+    }
+    return acc;
+  }, {});
+};
 export const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
 export const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
 export const BITTENSOR_API_KEY_3 = process.env.BITTENSOR_API_KEY_3 || '';
@@ -27,7 +46,7 @@ function random(...keys) {
   return validKeys[randomIndex];
 }
 export const bittensorApiKey = () => {
-  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6);
+  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6, BITTENSOR_API_KEY_7, BITTENSOR_API_KEY_8, BITTENSOR_API_KEY_9, BITTENSOR_API_KEY_10);
 };
 
 /* Fetch data */
@@ -46,20 +65,22 @@ export async function fetchDelegates() {
     }).catch(console.error);
   });
 }
-export async function fetchTaoDelegateState(address) {
-  const apiKey = bittensorApiKey();
-  return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `${apiKey}`
-      }
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
-}
+
+// export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {
+//   const apiKey = bittensorApiKey();
+
+//   return new Promise(function (resolve) {
+//     fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
+//       method: 'GET',
+//       headers: {
+//         'Content-Type': 'application/json',
+//         Authorization: `${apiKey}`
+//       }
+//     }).then((resp) => {
+//       resolve(resp.json());
+//     }).catch(console.error);
+//   });
+// }
 
 /* Fetch data */
 
@@ -160,11 +181,12 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake,
-          validatorIdentity: delegate.identity
+          validatorMinStake: minDelegatorStake
+          // validatorIdentity: delegate.identity
         });
       }
     }
+
     const stakingStatus = getEarningStatusByNominations(allActiveStake, nominationList);
     return {
       status: stakingStatus,
@@ -192,9 +214,10 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString(),
-          identity: testnetAddress
+          amount: bnStakeAmount.toString()
+          // identity: testnetAddress
         });
+
         rsCallback({
           ...defaultInfo,
           type: this.type,
@@ -217,20 +240,32 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       await Promise.all(stakePromises);
     };
     const getMainnetPoolPosition = async () => {
-      const rawDelegateStateInfos = await Promise.all(useAddresses.map(address => fetchTaoDelegateState(address)));
-      if (rawDelegateStateInfos.length > 0) {
+      const rawDelegateStateInfos = await Promise.all(useAddresses.map(async address => (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON()));
+      const price = await getTaoToAlphaMapping(this.substrateApi);
+      if (rawDelegateStateInfos && rawDelegateStateInfos.length > 0) {
         rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
           const owner = reformatAddress(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.data;
+          const delegateStateInfo = rawDelegateStateInfo;
+          const totalDelegate = {};
           for (const delegate of delegateStateInfo) {
-            const name = delegate.hotkey_name || delegate.hotkey.ss58;
-            bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+            const hotkey = delegate.hotkey;
+            const netuid = delegate.netuid;
+            const stake = new BigN(delegate.stake);
+            const taoToAlphaPrice = price[netuid] ? new BigN(price[netuid]) : new BigN(1);
+            const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+            if (totalDelegate[hotkey]) {
+              totalDelegate[hotkey] = new BigN(totalDelegate[hotkey]).plus(taoStake).toString();
+            } else {
+              totalDelegate[hotkey] = taoStake;
+            }
+          }
+          for (const hotkey in totalDelegate) {
+            bnTotalBalance = bnTotalBalance.add(new BN(totalDelegate[hotkey]));
             delegatorState.push({
-              owner: delegate.hotkey.ss58,
-              amount: delegate.stake,
-              identity: name
+              owner: hotkey,
+              amount: totalDelegate[hotkey]
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {
@@ -260,6 +295,61 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         });
       }
     };
+
+    // const getMainnetPoolPosition = async () => {
+    //   const rawDelegateStateInfos = await Promise.all(
+    //     useAddresses.map((address) => fetchTaoDelegateState(address))
+    //   );
+
+    //   if (rawDelegateStateInfos.length > 0) {
+    //     rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
+    //       const owner = reformatAddress(useAddresses[i], 42);
+    //       const delegatorState: TaoStakingStakeOption[] = [];
+    //       let bnTotalBalance = BN_ZERO;
+    //       const delegateStateInfo = rawDelegateStateInfo.data;
+
+    //       for (const delegate of delegateStateInfo) {
+    //         const name = delegate.hotkey_name || delegate.hotkey.ss58;
+
+    //         bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+
+    //         delegatorState.push({
+    //           owner: delegate.hotkey.ss58,
+    //           amount: delegate.stake,
+    //           identity: name
+    //         });
+    //       }
+
+    //       if (delegateStateInfo && delegateStateInfo.length > 0) {
+    //         this.parseNominatorMetadata(chainInfo, owner, delegatorState)
+    //           .then((nominatorMetadata) => {
+    //             rsCallback({
+    //               ...defaultInfo,
+    //               ...nominatorMetadata,
+    //               address: owner,
+    //               type: this.type
+    //             });
+    //           })
+    //           .catch(console.error);
+    //       } else {
+    //         rsCallback({
+    //           ...defaultInfo,
+    //           type: this.type,
+    //           address: owner,
+    //           balanceToken: this.nativeToken.slug,
+    //           totalStake: '0',
+    //           activeStake: '0',
+    //           unstakeBalance: '0',
+    //           status: EarningStatus.NOT_STAKING,
+    //           isBondedBefore: false,
+    //           nominations: [],
+    //           unstakings: []
+    //         });
+    //       }
+    //     });
+    //   }
+    // };
+
     const getStakingPositionInterval = async () => {
       if (cancel) {
         return;
@@ -364,7 +454,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     const binaryAmount = new BN(amount);
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, binaryAmount);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -382,7 +472,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     if (!selectedTarget || !poolPosition) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount);
     return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 

package/services/earning-service/handlers/nomination-pool/index.js

@@ -83,7 +83,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
 
       const supportedDays = getSupportedDaysByHistoryDepth(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays.toString()).keys()].map(i => i + startEra))]);
+      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = getAvgValidatorEraReward(supportedDays, _eraReward[0]);

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

@@ -3,10 +3,10 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, XCM_FEE_RATIO } from '@subwallet/extension-base/constants';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetName, _getAssetSymbol, _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
 import { t } from 'i18next';
@@ -73,17 +73,27 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       value: '0'
     }), this.state.balanceService.getTransferableBalance(request.address, feeAssetInfo.originChain, feeAssetInfo.slug)]);
     const bnInputAssetBalance = new BN(inputAssetBalance.value);
-    const bnAltInputAssetBalance = new BN(altInputAssetBalance.value);
     const bnMinJoinPool = new BN(poolInfo.statistic.earningThreshold.join);
     const inputTokenInfo = this.state.chainService.getAssetBySlug(this.inputAsset);
     const altInputTokenInfo = this.state.chainService.getAssetBySlug(this.altInputAsset);
+    const existentialDeposit = new BN(_getAssetExistentialDeposit(altInputTokenInfo));
+    const bnAltInputAssetBalance = new BN(altInputAssetBalance.value);
     if (bnInputAssetBalance.add(bnAltInputAssetBalance).lt(bnMinJoinPool)) {
+      const missingAmount = bnMinJoinPool.sub(bnInputAssetBalance).sub(bnAltInputAssetBalance);
+      const isTheSame = missingAmount.toString() === bnMinJoinPool.toString();
       const originChain = this.state.getChainInfo(inputTokenInfo.originChain);
       const altChain = this.state.getChainInfo(altInputTokenInfo.originChain);
-      const parsedMinJoinPool = formatNumber(bnMinJoinPool.toString(), inputAssetInfo.decimals || 0);
+      const originSymbol = _getAssetSymbol(inputTokenInfo);
+      const altSymbol = _getAssetSymbol(altInputTokenInfo);
+      const originName = originChain.name;
+      const altName = altChain.name;
+      const parsedMinJoinPool = formatNumber(missingAmount.toString(), inputAssetInfo.decimals || 0);
+      const formatparsedMinJoinPool = isTheSame ? parsedMinJoinPool : Number(parsedMinJoinPool) + 0.01;
+      const parsedMinAltJoinPool = formatNumber(missingAmount.add(existentialDeposit).toString(), inputAssetInfo.decimals || 0);
+      const formatParsedMinAltJoinPool = isTheSame ? parsedMinAltJoinPool : Number(parsedMinAltJoinPool) + 0.01;
       return {
         passed: false,
-        errorMessage: `You need at least ${parsedMinJoinPool} ${inputTokenInfo.symbol} (${originChain.name}) or ${altInputTokenInfo.symbol} (${altChain.name}) to start earning`
+        errorMessage: `You need to deposit an additional ${formatparsedMinJoinPool} ${originSymbol} (${originName}) or ${formatParsedMinAltJoinPool} ${altSymbol} (${altName}) to start earning`
       };
     }
     if (this.feeAssets.length === 1) {
@@ -281,16 +291,15 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = YieldValidationStatus.NOT_ENOUGH_BALANCE;
+      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee.mul(new BN(XCM_FEE_RATIO)));
+      const inputTokenDecimal = _getAssetDecimals(inputTokenInfo);
       const maxBn = bnInputTokenBalance.add(new BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = formatNumber(maxBn.toString(), inputTokenInfo.decimals || 0);
-      const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
-      const symbol = altInputTokenInfo.symbol;
-      const altNetwork = this.state.getChainInfo(altInputTokenInfo.originChain);
+      const maxXCMValue = formatNumber(bnMaxXCM.toString(), inputTokenDecimal);
+      const symbol = _getAssetSymbol(altInputTokenInfo);
       const inputNetworkName = this.chainInfo.name;
-      const altNetworkName = altNetwork.name;
-      const currentValue = formatNumber(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
-      const maxXCMValue = formatNumber(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
+      const altNetworkName = _getAssetName(altInputTokenInfo);
+      const currentValue = formatNumber(bnInputTokenBalance.toString(), inputTokenDecimal);
       processValidation.message = t('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
           symbol,