@subwallet/extension-base 1.3.46-0 → 1.3.48-0

package/services/earning-service/handlers/liquid-staking/acala.js

@@ -27,7 +27,8 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     fastUnstake: true,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   constructor(state, chain) {
     super(state, chain);

package/services/earning-service/handlers/liquid-staking/bifrost.d.ts

@@ -32,7 +32,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
     readonly minAmountPercent: number;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     protected readonly rateDecimals = 0;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;

package/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -26,7 +26,8 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     fastUnstake: true,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   rateDecimals = 0;
   constructor(state, chain) {

package/services/earning-service/handlers/liquid-staking/parallel.d.ts

@@ -13,7 +13,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
     protected readonly feeAssets: string[];
     readonly minAmountPercent = 0.96;
     protected readonly rateDecimals = 18;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;
     getPoolStat(): Promise<LiquidYieldPoolInfo>;

package/services/earning-service/handlers/liquid-staking/parallel.js

@@ -22,7 +22,8 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
     fastUnstake: true,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   constructor(state, chain) {
     super(state, chain);

package/services/earning-service/handlers/liquid-staking/stella-swap.d.ts

@@ -17,7 +17,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     protected readonly feeAssets: string[];
     transactionChainType: ChainType;
     protected readonly rateDecimals = 10;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;
     getPoolStat(): Promise<LiquidYieldPoolInfo>;

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -33,7 +33,8 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   constructor(state, chain) {
     super(state, chain);

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

@@ -7,6 +7,7 @@ import BaseParaNativeStakingPoolHandler from './base-para';
 export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption[], unstakingInfo: Record<string, number>): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
     getKrestPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;

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

@@ -171,6 +171,38 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
       unstakings: unstakingList
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que = substrateApi.api.query.parachainStaking) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.delegatorState) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.multi) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.call(_substrateApi$api$que2, useAddresses));
+    const _unstakingStates = await ((_substrateApi$api$que4 = substrateApi.api.query.parachainStaking) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.unstaking) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.multi) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.call(_substrateApi$api$que5, useAddresses));
+    if (!ledgers || !_unstakingStates) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _delegatorState = ledgers[i];
+      let delegatorState = [];
+      const unstakingInfo = _unstakingStates[i].toPrimitive();
+      if (_STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
+        const krestDelegatorState = _delegatorState.toPrimitive();
+        const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+        if (delegates) {
+          delegatorState = delegatorState.concat(delegates);
+        }
+      } else {
+        const delegate = _delegatorState.toPrimitive();
+        if (delegate) {
+          delegatorState.push(delegate);
+        }
+      }
+      if (delegatorState.length || unstakingInfo && Object.keys(unstakingInfo).length) {
+        result.push(owner);
+      }
+    }
+    return Promise.resolve(result);
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;

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

@@ -5,10 +5,11 @@ import { BaseYieldPositionInfo, PalletDappsStakingAccountLedger, StakeCancelWith
 import BaseParaNativeStakingPoolHandler from './base-para';
 export declare function getAstarWithdrawable(yieldPosition: YieldPositionInfo): UnstakingInfo | undefined;
 export default class AstarNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletDappsStakingAccountLedger): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;

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

@@ -39,7 +39,8 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
 
   /* Subscribe pool info */
@@ -286,6 +287,24 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
       unsub && unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que2 = substrateApi.api.query.dappsStaking) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.ledger) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.multi) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.call(_substrateApi$api$que3, useAddresses));
+    if (!ledgers) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _ledger = ledgers[i];
+      const ledger = _ledger.toPrimitive();
+      if (ledger && ledger.locked > 0) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 

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

@@ -1,17 +1,18 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, SubmitChangeValidatorStaking, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import BasePoolHandler from '../base';
 export default abstract class BaseNativeStakingPoolHandler extends BasePoolHandler {
     readonly type = YieldPoolType.NATIVE_STAKING;
     protected readonly name: string;
     protected readonly shortName: string;
     slug: string;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    availableMethod: YieldPoolMethodInfo;
     static generateSlug(symbol: string, chain: string): string;
     constructor(state: KoniState, chain: string);
     protected getDescription(amount?: string): string;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
+    abstract checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     getPoolRewardHistory(useAddresses: string[], callBack: (rs: EarningRewardHistoryItem) => void): Promise<VoidFunction>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     abstract createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string, netuid?: number): Promise<[TransactionData, YieldTokenBaseInfo]>;
@@ -19,4 +20,5 @@ export default abstract class BaseNativeStakingPoolHandler extends BasePoolHandl
     handleYieldJoin(_data: SubmitYieldJoinData, path: OptimalYieldPath, currentStep: number): Promise<HandleYieldStepData>;
     handleYieldRedeem(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
     handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
+    handleChangeEarningValidator(_data: SubmitChangeValidatorStaking): Promise<TransactionData>;
 }

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

@@ -14,7 +14,8 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
     fastUnstake: false,
     cancelUnstake: true,
     withdraw: true,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   static generateSlug(symbol, chain) {
     return `${symbol}___native_staking___${chain}`;
@@ -42,40 +43,48 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
   async getPoolRewardHistory(useAddresses, callBack) {
     let cancel = false;
     const haveSubscanService = this.state.subscanService.checkSupportedSubscanChain(this.chain);
+    const requestGroupId = this.state.subscanService.getGroupId();
     if (haveSubscanService) {
-      for (const address of useAddresses) {
-        if (cancel) {
-          break;
-        }
-        try {
-          const rs = await this.state.subscanService.getRewardHistoryList(this.chain, address);
-          const items = rs === null || rs === void 0 ? void 0 : rs.list;
-          if (items) {
-            for (const item of items) {
-              const now = new Date();
-              const isMillisecond = now.getTime().toString().length === item.block_timestamp.toString().length;
-              const timeStamp = isMillisecond ? item.block_timestamp : item.block_timestamp * 1000;
-              const data = {
-                slug: this.slug,
-                type: this.type,
-                chain: this.chain,
-                address: address,
-                group: this.group,
-                blockTimestamp: timeStamp,
-                amount: item.amount,
-                eventIndex: item.event_index
-              };
-              callBack(data);
-            }
+      this.checkAccountHaveStake(useAddresses).then(activeAddresses => {
+        for (const address of useAddresses) {
+          if (cancel) {
+            break;
+          }
+          if (!activeAddresses.includes(address)) {
+            continue;
           }
-        } catch (e) {
-          console.error(e);
+          this.state.subscanService.getRewardHistoryList(requestGroupId, this.chain, address).then(rs => {
+            const items = rs === null || rs === void 0 ? void 0 : rs.list;
+            if (cancel) {
+              return;
+            }
+            if (items) {
+              for (const item of items) {
+                const now = new Date();
+                const isMillisecond = now.getTime().toString().length === item.block_timestamp.toString().length;
+                const timeStamp = isMillisecond ? item.block_timestamp : item.block_timestamp * 1000;
+                const data = {
+                  slug: this.slug,
+                  type: this.type,
+                  chain: this.chain,
+                  address: address,
+                  group: this.group,
+                  blockTimestamp: timeStamp,
+                  amount: item.amount,
+                  eventIndex: item.event_index
+                };
+                callBack(data);
+              }
+            }
+          }).catch(console.error);
         }
-      }
+      }).catch(console.error);
     }
-    return () => {
+    return Promise.resolve(() => {
+      console.log('Cancel get pool reward history', requestGroupId);
       cancel = false;
-    };
+      this.state.subscanService.cancelGroupRequest(requestGroupId);
+    });
   }
 
   /* Get pool reward */
@@ -156,6 +165,9 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
   async handleYieldClaimReward(address, bondReward) {
     return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
   }
+  async handleChangeEarningValidator(_data) {
+    return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
+  }
 
   /* Other actions */
 }

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

@@ -3,7 +3,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
-import { BaseYieldPositionInfo, OptimalYieldPath, RequestEarningSlippage, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, OptimalYieldPath, RequestEarningSlippage, StakeCancelWithdrawalParams, SubmitBittensorChangeValidatorStaking, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import BigN from 'bignumber.js';
 export interface SubnetData {
     netuid: number;
@@ -40,7 +40,7 @@ export interface EarningSlippageResult {
     slippage: number;
     rate: number;
 }
-export declare const DEFAULT_DTAO_MINBOND = "600000";
+export declare const DEFAULT_DTAO_MINBOND = "21000000";
 export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHandler {
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
@@ -61,12 +61,14 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, delegatorState: TaoStakingStakeOption[]): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], rsCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     private getDevnetPoolTargets;
     private getMainnetPoolTargets;
-    getPoolTargets(): Promise<ValidatorInfo[]>;
+    getPoolTargets(netuid: number): Promise<ValidatorInfo[]>;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;
     validateYieldJoin(data: SubmitJoinNativeStaking, path: OptimalYieldPath): Promise<TransactionError[]>;
     handleYieldUnstake(amount: string, address: string, selectedTarget?: string, netuid?: number, slippage?: number): Promise<[ExtrinsicType, TransactionData]>;
     validateYieldLeave(amount: string, address: string, fastLeave: boolean, selectedTarget?: string, slug?: string, poolInfo?: YieldPoolInfo): Promise<TransactionError[]>;
+    handleChangeEarningValidator(data: SubmitBittensorChangeValidatorStaking): Promise<TransactionData>;
 }
 export {};

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

@@ -7,15 +7,14 @@ import { BITTENSOR_REFRESH_STAKE_APY, BITTENSOR_REFRESH_STAKE_INFO } from '@subw
 import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _getAssetDecimals, _getAssetSymbol } from '@subwallet/extension-base/services/chain-service/utils';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
-import { BasicTxErrorType, EarningStatus, YieldPoolType } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';
-import { calculateReward } from "../../utils/index.js";
 import { BittensorCache } from "./tao.js";
 const DEFAULT_BITTENSOR_SLIPPAGE = 0.005;
-export const DEFAULT_DTAO_MINBOND = '600000';
+export const DEFAULT_DTAO_MINBOND = '21000000';
 const getAlphaToTaoMapping = async substrateApi => {
   const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
   if (!allSubnets || allSubnets.length === 0) {
@@ -62,7 +61,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: true
   };
   constructor(state, chain) {
     super(state, chain);
@@ -364,6 +364,11 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     };
   }
 
+  // Because not have subscan api
+  async checkAccountHaveStake(useAddresses) {
+    return Promise.resolve([]);
+  }
+
   /* Subscribe pool position */
 
   /* Get pool targets */
@@ -388,32 +393,37 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
       isCrowded: false
     }));
   }
-  async getMainnetPoolTargets() {
+  async getMainnetPoolTargets(netuid) {
     const _topValidator = await this.bittensorCache.get();
     const topValidator = _topValidator;
     const bnMinBond = new BigN(DEFAULT_DTAO_MINBOND);
     const validatorList = topValidator.data;
-    const validatorAddresses = Object.keys(validatorList);
-    const results = await Promise.all(validatorAddresses.map(i => {
-      const address = validatorList[i].hotkey.ss58;
-      const bnTotalStake = new BigN(validatorList[i].stake);
-      const bnOwnStake = new BigN(validatorList[i].validator_stake);
-      const otherStake = bnTotalStake.minus(bnOwnStake);
-      const nominatorCount = validatorList[i].nominators;
-      const commission = validatorList[i].take;
+    const aprResponse = await this.bittensorCache.fetchApr(netuid);
+    const aprMap = {};
+    aprResponse.data.forEach(item => {
+      aprMap[item.hotkey.ss58] = item.thirty_day_apy;
+    });
+    const results = await Promise.all(validatorList.map(validator => {
+      const address = validator.hotkey.ss58;
+      // With bittensor we use total weight, root weight and alpha staked insted of total stake, own stake and other stake
+      const bnTotalWeightStake = new BigN(validator.global_weighted_stake);
+      const bnRootWeightStake = new BigN(validator.weighted_root_stake);
+      const bnAlphaStake = new BigN(validator.global_alpha_stake_as_tao);
+      const nominatorCount = validator.global_nominators;
+      const commission = validator.take;
       const roundedCommission = (parseFloat(commission) * 100).toFixed(0);
-      const apr = (parseFloat(validatorList[i].apr) / 10 ** 9 * 100).toFixed(2);
-      const apyCalculate = calculateReward(parseFloat(apr));
-      const name = validatorList[i].name || address;
+      const apr = aprMap[address];
+      const expectedReturn = apr ? new BigN(apr).multipliedBy(100).toFixed(2) : '0';
+      const name = validator.name || address;
       return {
         address: address,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: otherStake.toString(),
+        totalStake: bnTotalWeightStake.toString(),
+        ownStake: bnRootWeightStake.toString(),
+        otherStake: bnAlphaStake.toString(),
         minBond: bnMinBond.toString(),
         nominatorCount: nominatorCount,
         commission: roundedCommission,
-        expectedReturn: apyCalculate.apy,
+        expectedReturn: expectedReturn,
         blocked: false,
         isVerified: false,
         chain: this.chain,
@@ -423,10 +433,10 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     }));
     return results;
   }
-  async getPoolTargets() {
+  async getPoolTargets(netuid) {
     await this.init();
     if (this.chain === 'bittensor') {
-      return this.getMainnetPoolTargets();
+      return this.getMainnetPoolTargets(netuid);
     } else {
       return this.getDevnetPoolTargets();
     }
@@ -442,6 +452,9 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
       selectedValidators: targetValidators,
       subnetData
     } = data;
+    if (!subnetData) {
+      throw new Error(BasicTxErrorType.INVALID_PARAMS);
+    }
     const {
       netuid,
       slippage
@@ -451,6 +464,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 + (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
     const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
+
+    // Bittensor only supports changing 1 validator at a time, not multiple
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
     const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
@@ -459,6 +474,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
       amount: '0'
     }];
   }
+
+  // Validate for case stake more
   async validateYieldJoin(data, path) {
     const baseErrors = await super.validateYieldJoin(data, path);
     if (baseErrors.length > 0) {
@@ -510,4 +527,45 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
   }
 
   /* Leave pool action */
+
+  /* Change validator */
+  async handleChangeEarningValidator(data) {
+    const chainApi = await this.substrateApi.isReady;
+    const {
+      amount,
+      maxAmount,
+      metadata,
+      originValidator,
+      selectedValidators: targetValidators,
+      subnetData
+    } = data;
+    if (!subnetData || !originValidator) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const {
+      netuid
+    } = subnetData;
+    const selectedValidatorInfo = targetValidators[0];
+    const destValidator = selectedValidatorInfo.address;
+    if (new BigN(amount).lte(0)) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Amount must be greater than 0')));
+    }
+    if (originValidator === destValidator) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS, 'From validator is the same with to validator'));
+    }
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const minUnstake = new BigN(DEFAULT_DTAO_MINBOND).dividedBy(alphaToTaoPrice);
+    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(BigN.ROUND_CEIL).dividedBy(1000);
+    const bnMinUnstake = formattedMinUnstake.multipliedBy(10 ** _getAssetDecimals(this.nativeToken));
+    if (new BigN(maxAmount).lt(bnMinUnstake)) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Amount too low. You need to move at least ${formattedMinUnstake.toString()} ${(metadata === null || metadata === void 0 ? void 0 : metadata.subnetSymbol) || ''}`)));
+    }
+
+    // Avoid remaining amount too low -> can't do anything with that amount
+    if (!(maxAmount === amount) && new BigN(maxAmount).minus(new BigN(amount)).lt(bnMinUnstake)) {
+      return Promise.reject(new TransactionError(StakingTxErrorType.REMAINING_AMOUNT_TOO_LOW, t(`Your remaining stake on the initial validator will fall below minimum active stake and cannot be unstaked if you proceed with the chosen amount. Hit "Move all" to move all ${formatNumber(maxAmount, _getAssetDecimals(this.nativeToken))} ${(metadata === null || metadata === void 0 ? void 0 : metadata.subnetSymbol) || ''} to the new validator, or "Cancel" and lower the amount, then try again`)));
+    }
+    const extrinsic = chainApi.api.tx.subtensorModule.moveStake(originValidator, destValidator, netuid, netuid, amount);
+    return extrinsic;
+  }
 }

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

@@ -11,8 +11,9 @@ interface PalletCollatorStakingUserStakeInfo {
     maybeLastRewardSession: string;
 }
 export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<Array<string>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     parseCollatorMetadata(chainInfo: _ChainInfo, stakerAddress: string, substrateApi: _SubstrateApi, userStake: PalletCollatorStakingUserStakeInfo): Promise<{
         status: EarningStatus;

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

@@ -30,7 +30,8 @@ export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolH
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
 
   /* Subscribe pool info */
@@ -119,6 +120,34 @@ export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolH
 
   /* Subscribe pool position */
 
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que = substrateApi.api.query.collatorStaking) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.userStake) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.multi) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.call(_substrateApi$api$que2, useAddresses));
+    const _unstakings = await Promise.all(useAddresses.map(stakerAddress => {
+      var _substrateApi$api$que4, _substrateApi$api$que5;
+      return (_substrateApi$api$que4 = substrateApi.api.query.collatorStaking) === null || _substrateApi$api$que4 === void 0 ? void 0 : (_substrateApi$api$que5 = _substrateApi$api$que4.releaseQueues) === null || _substrateApi$api$que5 === void 0 ? void 0 : _substrateApi$api$que5.call(_substrateApi$api$que4, stakerAddress);
+    }));
+    if (!ledgers || !_unstakings) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const _userStake = ledgers[i];
+      const userStake = _userStake.toPrimitive();
+      const _unstaking = _unstakings[i];
+      const unstakings = _unstaking.toPrimitive();
+
+      // TODO: Need to improve, check if can only load stake info
+      if (userStake && userStake.stake !== '0') {
+        result.push(owner);
+      } else if (unstakings && unstakings.some(unstake => unstake.amount !== '0')) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;

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

@@ -7,6 +7,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: PalletParachainStakingDelegator): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     getMantaPoolTargets(): Promise<ValidatorInfo[]>;
     getParachainPoolTargets(): Promise<ValidatorInfo[]>;
     getPoolTargets(): Promise<ValidatorInfo[]>;

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -268,6 +268,23 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que = substrateApi.api.query.parachainStaking) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.delegatorState) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.multi) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.call(_substrateApi$api$que2, useAddresses));
+    if (!ledgers) {
+      return [];
+    }
+    for (let i = 0; i < useAddresses.length; i++) {
+      const owner = useAddresses[i];
+      const delegatorState = ledgers[i].toPrimitive();
+      if (delegatorState && delegatorState.total > 0) {
+        result.push(owner);
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 

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

@@ -2,16 +2,20 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType, NominationInfo, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BaseYieldPositionInfo, OptimalYieldPath, PalletStakingNominations, PalletStakingStakingLedger, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, OptimalYieldPath, PalletStakingNominations, PalletStakingStakingLedger, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { DeriveSessionProgress } from '@polkadot/api-derive/types';
 import { BN } from '@polkadot/util';
 import BaseNativeStakingPoolHandler from './base';
 export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPoolHandler {
+    availableMethod: YieldPoolMethodInfo;
+    constructor(state: KoniState, chain: string);
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletStakingStakingLedger, currentEra: string, minStake: BN, _deriveSessionProgress: DeriveSessionProgress): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     handleNominationsList(substrateApi: _SubstrateApi, chain: string, nominations: PalletStakingNominations, currentEra: string, address: string, maxNominatorRewardedPerValidator: number | undefined): Promise<NominationInfo[]>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
+    checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
     private getValidatorExpectedReturn;
     private parseEraStakerData;
@@ -21,4 +25,5 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
+    handleChangeEarningValidator(data: SubmitChangeValidatorStaking): Promise<TransactionData>;
 }