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

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

@@ -6,7 +6,7 @@ import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getRelayWaitingValidatorList, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
-import { _STAKING_CHAIN_GROUP, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
+import { _STAKING_CHAIN_GROUP, _SUPPORT_CHANGE_VALIDATOR_CHAIN, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
 import { applyDecimal, parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { BasicTxErrorType, EarningStatus, StakingTxErrorType, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
@@ -15,6 +15,24 @@ import { t } from 'i18next';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseNativeStakingPoolHandler from "./base.js";
 export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPoolHandler {
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: false,
+    cancelUnstake: true,
+    withdraw: true,
+    claimReward: false,
+    changeValidator: false
+  };
+  constructor(state, chain) {
+    super(state, chain);
+    if (_SUPPORT_CHANGE_VALIDATOR_CHAIN.includes(chain)) {
+      this.availableMethod = {
+        ...this.availableMethod,
+        changeValidator: true
+      };
+    }
+  }
   /* Subscribe pool info */
 
   async subscribePoolInfo(callback) {
@@ -283,6 +301,22 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       unsub === null || unsub === void 0 ? void 0 : unsub();
     };
   }
+  async checkAccountHaveStake(useAddresses) {
+    var _substrateApi$api$que22, _substrateApi$api$que23, _substrateApi$api$que24;
+    const result = [];
+    const substrateApi = await this.substrateApi.isReady;
+    const ledgers = await ((_substrateApi$api$que22 = substrateApi.api.query.staking) === null || _substrateApi$api$que22 === void 0 ? void 0 : (_substrateApi$api$que23 = _substrateApi$api$que22.ledger) === null || _substrateApi$api$que23 === void 0 ? void 0 : (_substrateApi$api$que24 = _substrateApi$api$que23.multi) === null || _substrateApi$api$que24 === void 0 ? void 0 : _substrateApi$api$que24.call(_substrateApi$api$que23, useAddresses));
+    if (ledgers) {
+      for (let i = 0; i < useAddresses.length; i++) {
+        const address = useAddresses[i];
+        const _ledger = ledgers[i].toPrimitive();
+        if (_ledger.total > 0) {
+          result.push(address);
+        }
+      }
+    }
+    return result;
+  }
 
   /* Subscribe pool position */
 
@@ -652,13 +686,11 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const chainApi = await this.substrateApi.isReady;
     if (chainApi.api.tx.staking.withdrawUnbonded.meta.args.length === 1) {
       let slashingSpanCount;
-      if (chainApi.api.query.staking.nominatorSlashInEra) {
-        const currentEra = await chainApi.api.query.staking.currentEra();
-        const slashingSpans = (await chainApi.api.query.staking.nominatorSlashInEra(currentEra.toPrimitive(), address)).toPrimitive();
-        slashingSpanCount = slashingSpans !== null ? slashingSpans.toString() : '0';
-      } else {
+      if (chainApi.api.query.staking.slashingSpans) {
         const _slashingSpans = (await chainApi.api.query.staking.slashingSpans(address)).toHuman();
         slashingSpanCount = _slashingSpans !== null ? _slashingSpans.spanIndex : '0';
+      } else {
+        slashingSpanCount = chainApi.api.consts.staking.historyDepth.toPrimitive();
       }
       return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
     } else {
@@ -666,6 +698,17 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       return chainApi.api.tx.staking.withdrawUnbonded();
     }
   }
-
+  async handleChangeEarningValidator(data) {
+    const chainApi = await this.substrateApi.isReady;
+    const {
+      selectedValidators
+    } = data;
+    if (!selectedValidators || selectedValidators.length === 0) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const validatorParamList = selectedValidators.map(validator => validator.address);
+    const nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
+    return nominateTx;
+  }
   /* Other actions */
 }

package/services/earning-service/handlers/native-staking/tao.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, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, OptimalYieldPath, StakeCancelWithdrawalParams, SubmitBittensorChangeValidatorStaking, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 export interface TaoStakeInfo {
     hotkey: string;
     stake: string;
@@ -31,11 +31,27 @@ interface Validator {
         ss58: string;
     };
     name: string;
-    nominators: number;
+    global_nominators: number;
+    validator_return_per_day: string;
+    nominator_return_per_day: string;
     stake: string;
     validator_stake: string;
     take: string;
-    apr: string;
+    root_stake: string;
+    global_weighted_stake: string;
+    weighted_root_stake: string;
+    global_alpha_stake_as_tao: string;
+}
+interface ValidatorAprResponse {
+    data: ValidatorApr[];
+}
+interface ValidatorApr {
+    hotkey: {
+        ss58: string;
+    };
+    name: string;
+    netuid: number;
+    thirty_day_apy: string;
 }
 export declare class BittensorCache {
     private static instance;
@@ -46,9 +62,10 @@ export declare class BittensorCache {
     static getInstance(): BittensorCache;
     get(): Promise<ValidatorResponse>;
     private fetchData;
+    fetchApr(netuid: number): Promise<ValidatorAprResponse>;
 }
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     private bittensorCache;
     constructor(state: KoniState, chain: string);
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
@@ -57,6 +74,7 @@ export default class TaoNativeStakingPoolHandler 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[]>;
@@ -64,5 +82,6 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     validateYieldJoin(data: SubmitJoinNativeStaking, path: OptimalYieldPath): Promise<TransactionError[]>;
     handleYieldUnstake(amount: string, address: string, selectedTarget?: string): 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/tao.js

@@ -7,14 +7,12 @@ 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 } from '@subwallet/extension-base/types';
+import { BasicTxErrorType, EarningStatus, StakingTxErrorType } from '@subwallet/extension-base/types';
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { fetchFromProxyService, 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 { DEFAULT_DTAO_MINBOND } from "./dtao.js";
 /* Fetch data */
 export class BittensorCache {
   static instance = null;
@@ -42,7 +40,7 @@ export class BittensorCache {
   }
   async fetchData() {
     try {
-      const resp = await fetchFromProxyService(ProxyServiceRoute.BITTENSOR, '/validator/latest/v1?limit=50', {
+      const resp = await fetchFromProxyService(ProxyServiceRoute.BITTENSOR, '/dtao/validator/latest/v1?limit=100', {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json'
@@ -56,7 +54,7 @@ export class BittensorCache {
       }
       const rawData = await resp.json();
       const data = {
-        data: rawData.data.filter(validator => parseFloat(validator.apr) > 0.0001)
+        data: rawData.data.filter(validator => parseFloat(validator.root_stake) > 0)
       };
       this.cache = data;
       this.promise = null;
@@ -79,6 +77,27 @@ export class BittensorCache {
       };
     }
   }
+  async fetchApr(netuid) {
+    try {
+      const resp = await fetchFromProxyService(ProxyServiceRoute.BITTENSOR, `/dtao/validator/yield/latest/v1?netuid=${netuid}&limit=100&order=thirty_day_apy_desc`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
+      const rawData = await resp.json();
+
+      // Some subnets not return data, ensure the structure is consistent by returning an empty array
+      return Array.isArray(rawData.data) ? rawData : {
+        data: []
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        data: []
+      };
+    }
+  }
 }
 
 // export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {
@@ -117,7 +136,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: true
   };
   constructor(state, chain) {
     super(state, chain);
@@ -153,23 +173,18 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         const minDelegatorStake = (await substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
         const maxValidatorPerNominator = (await substrateApi.api.query.subtensorModule.maxAllowedValidators(0)).toPrimitive();
         const taoIn = (await substrateApi.api.query.subtensorModule.subnetTAO(0)).toPrimitive();
-        const _topValidator = await this.bittensorCache.get();
+        const _topValidator = await this.bittensorCache.fetchApr(0);
         const validators = _topValidator.data;
-        let highestApr = validators[0];
-        for (let i = 1; i < validators.length; i++) {
-          if (parseFloat(validators[i].apr) > parseFloat(highestApr.apr)) {
-            highestApr = validators[i];
-          }
-        }
+        const highestApr = validators[0];
         const bnTaoIn = new BigN(taoIn);
         const BNminDelegatorStake = new BigN(minDelegatorStake.toString());
-        const apr = this.chain === 'bittensor' ? Number(highestApr.apr) * 100 : 0;
+        const apr = this.chain === 'bittensor' ? Number(highestApr.thirty_day_apy) * 100 : 0;
         const data = {
           ...this.baseInfo,
           type: this.type,
           metadata: {
             ...this.metadataInfo,
-            description: this.getDescription()
+            description: this.getDescription(formatNumber(BNminDelegatorStake, _getAssetDecimals(this.nativeToken)))
           },
           statistic: {
             assetEarning: [{
@@ -380,6 +395,11 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     };
   }
 
+  // Because not have subscan api
+  async checkAccountHaveStake(useAddresses) {
+    return Promise.resolve([]);
+  }
+
   /* Subscribe pool position */
 
   /* Get pool targets */
@@ -411,27 +431,32 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
     const bnMinBond = new BigN(nominatorMinRequiredStake);
     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(0);
+    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,
@@ -468,6 +493,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       amount: '0'
     }];
   }
+
+  // Validate for case stake more
   async validateYieldJoin(data, path) {
     const baseErrors = await super.validateYieldJoin(data, path);
     if (baseErrors.length > 0) {
@@ -476,8 +503,10 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     const {
       amount
     } = data;
-    if (new BigN(amount).lt(new BigN(DEFAULT_DTAO_MINBOND))) {
-      return [new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Insufficient stake. You need to stake at least ${formatNumber(DEFAULT_DTAO_MINBOND, _getAssetDecimals(this.nativeToken))} ${_getAssetSymbol(this.nativeToken)} to earn rewards`))];
+    const minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinStake = minDelegatorStake.toString();
+    if (new BigN(amount).lt(bnMinStake)) {
+      return [new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Insufficient stake. You need to stake at least ${formatNumber(bnMinStake, _getAssetDecimals(this.nativeToken))} ${_getAssetSymbol(this.nativeToken)} to earn rewards`))];
     }
     return baseErrors;
   }
@@ -504,7 +533,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     if (!poolInfo) {
       return [new TransactionError(BasicTxErrorType.INVALID_PARAMS)];
     }
-    const bnMinUnstake = new BigN(DEFAULT_DTAO_MINBOND);
+    const minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinUnstake = new BigN(minDelegatorStake.toString());
     if (new BigN(amount).lt(bnMinUnstake)) {
       return [new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Amount too low. You need to unstake at least ${formatNumber(bnMinUnstake, _getAssetDecimals(this.nativeToken))} ${_getAssetSymbol(this.nativeToken)}`))];
     }
@@ -512,4 +542,40 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
   }
 
   /* Leave pool action */
+
+  /* Change validator */
+  async handleChangeEarningValidator(data) {
+    const chainApi = await this.substrateApi.isReady;
+    const {
+      amount,
+      maxAmount,
+      originValidator,
+      selectedValidators: targetValidators
+    } = data;
+    if (!originValidator) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+
+    // Bittensor only supports changing 1 validator at a time, not multiple
+    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 minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinMoveStake = new BigN(minDelegatorStake.toString());
+    if (new BigN(maxAmount).lt(bnMinMoveStake)) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Amount too low. You need to move at least ${formatNumber(bnMinMoveStake, _getAssetDecimals(this.nativeToken))} ${_getAssetSymbol(this.nativeToken)}`)));
+    }
+
+    // Avoid remaining amount too low -> can't do anything with that amount
+    if (!(maxAmount === amount) && new BigN(maxAmount).minus(new BigN(amount)).lt(bnMinMoveStake)) {
+      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))} ${_getAssetSymbol(this.nativeToken)} to the new validator, or "Cancel" and lower the amount, then try again`)));
+    }
+    const extrinsic = chainApi.api.tx.subtensorModule.moveStake(originValidator, destValidator, 0, 0, amount);
+    return extrinsic;
+  }
 }

package/services/earning-service/handlers/nomination-pool/index.d.ts

@@ -3,7 +3,7 @@ import { ExtrinsicType, UnstakingInfo } from '@subwallet/extension-base/backgrou
 import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/core/substrate/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BaseYieldPositionInfo, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, StakeCancelWithdrawalParams, SubmitJoinNominationPool, SubmitYieldJoinData, TransactionData, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitJoinNominationPool, SubmitYieldJoinData, TransactionData, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { DeriveSessionProgress } from '@polkadot/api-derive/types';
 import BasePoolHandler from '../base';
 export default class NominationPoolHandler extends BasePoolHandler {
@@ -11,7 +11,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
     protected readonly name: string;
     protected readonly shortName: string;
     slug: string;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     static generateSlug(symbol: string, chain: string): string;
     constructor(state: KoniState, chain: string);
     protected getDescription(amount?: string): string;
@@ -35,4 +35,5 @@ export default class NominationPoolHandler extends BasePoolHandler {
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
     handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
+    handleChangeEarningValidator(data: SubmitChangeValidatorStaking): Promise<TransactionData>;
 }

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

@@ -20,7 +20,8 @@ export default class NominationPoolHandler extends BasePoolHandler {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
   static generateSlug(symbol, chain) {
     return `${symbol}___nomination_pool___${chain}`;
@@ -575,6 +576,8 @@ export default class NominationPoolHandler extends BasePoolHandler {
       });
     }
   }
-
+  handleChangeEarningValidator(data) {
+    return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
+  }
   /* Other actions */
 }

package/services/earning-service/handlers/special.d.ts

@@ -2,7 +2,7 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { BaseYieldStepDetail, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, ResponseEarlyValidateYield, SpecialYieldPoolInfo, SpecialYieldPoolMetadata, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolTarget, YieldPoolType, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldStepDetail, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, ResponseEarlyValidateYield, SpecialYieldPoolInfo, SpecialYieldPoolMetadata, SubmitChangeValidatorStaking, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolTarget, YieldPoolType, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { BN } from '@polkadot/util';
 import BasePoolHandler from './base';
 export default abstract class BaseSpecialStakingPoolHandler extends BasePoolHandler {
@@ -62,4 +62,5 @@ export default abstract class BaseSpecialStakingPoolHandler extends BasePoolHand
     handleYieldCancelUnstake(): Promise<TransactionData>;
     handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
+    handleChangeEarningValidator(data: SubmitChangeValidatorStaking): Promise<TransactionData>;
 }

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

@@ -512,6 +512,8 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
   handleYieldWithdraw(address, unstakingInfo) {
     return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
   }
-
+  handleChangeEarningValidator(data) {
+    return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
+  }
   /* Other actions */
 }

package/services/earning-service/service.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 { PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
-import { EarningRewardHistoryItem, EarningRewardItem, EarningRewardJson, HandleYieldStepData, HandleYieldStepParams, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldLeave, RequestYieldWithdrawal, ResponseEarlyValidateYield, TransactionData, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolTarget, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { EarningRewardHistoryItem, EarningRewardItem, EarningRewardJson, HandleYieldStepData, HandleYieldStepParams, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldLeave, RequestYieldWithdrawal, ResponseEarlyValidateYield, SubmitChangeValidatorStaking, TransactionData, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolTarget, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 import { EarningSlippageResult } from './handlers/native-staking/dtao';
@@ -83,6 +83,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     subscribeEarningRewardHistory(): BehaviorSubject<Record<string, EarningRewardHistoryItem>>;
     getEarningRewardHistory(): Record<string, EarningRewardHistoryItem>;
     earningsRewardHistoryInterval: NodeJS.Timer | undefined;
+    private unSubFetchEarningRewardHistory;
     runSubscribeEarningRewardHistoryInterval(): void;
     runUnsubscribeEarningRewardHistoryInterval(): void;
     /**
@@ -102,5 +103,6 @@ export default class EarningService implements StoppableServiceInterface, Persis
     handleYieldCancelUnstake(params: RequestStakeCancelWithdrawal): Promise<TransactionData>;
     handleYieldClaimReward(params: RequestStakeClaimReward): Promise<TransactionData>;
     yieldGetEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
+    handleYieldChangeValidator(params: SubmitChangeValidatorStaking): Promise<TransactionData>;
     resetWallet(): Promise<void>;
 }

package/services/earning-service/service.js

@@ -377,7 +377,13 @@ export default class EarningService {
       delete onlineData[inactiveSlug];
     }
     Object.values(onlineData).forEach(item => {
-      this.updateYieldPoolInfo(item);
+      const handler = this.getPoolHandler(item.slug);
+      if (!handler) {
+        return;
+      }
+      const updatedItem = structuredClone(item);
+      updatedItem.metadata.availableMethod = handler.availableMethod;
+      this.updateYieldPoolInfo(updatedItem);
     });
     return onlineData;
   }
@@ -660,18 +666,39 @@ export default class EarningService {
     if (!addresses.length) {
       return;
     }
-    this.fetchPoolRewardHistory(addresses, result => {
-      this.updateEarningRewardHistory(result);
-    }).catch(console.error);
-    this.earningsRewardHistoryInterval = setInterval(() => {
+    let cancel = false;
+    let unsub;
+    this.unSubFetchEarningRewardHistory = () => {
+      if (!cancel) {
+        var _unsub2;
+        (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
+        cancel = true;
+      }
+    };
+    const fetchData = () => {
       this.fetchPoolRewardHistory(addresses, result => {
+        if (cancel) {
+          return;
+        }
         this.updateEarningRewardHistory(result);
+      }).then(_unsub => {
+        if (!cancel) {
+          var _unsub3;
+          (_unsub3 = unsub) === null || _unsub3 === void 0 ? void 0 : _unsub3();
+          unsub = _unsub;
+        }
       }).catch(console.error);
-    }, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
+    };
+    if (!cancel) {
+      fetchData();
+    }
+    this.earningsRewardHistoryInterval = setInterval(fetchData, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
   }
   runUnsubscribeEarningRewardHistoryInterval() {
+    var _this$unSubFetchEarni;
     removeLazy('updateEarningRewardHistory');
     this.earningRewardHistoryQueue = [];
+    (_this$unSubFetchEarni = this.unSubFetchEarningRewardHistory) === null || _this$unSubFetchEarni === void 0 ? void 0 : _this$unSubFetchEarni.call(this);
     this.earningsRewardHistoryInterval && clearInterval(this.earningsRewardHistoryInterval);
   }
 
@@ -693,7 +720,13 @@ export default class EarningService {
     const handler = this.getPoolHandler(slug);
     if (!targets.length && handler) {
       await this.eventService.waitChainReady;
-      targets = await handler.getPoolTargets();
+      const isSubnet = slug.match(/subnet_(\d+)/);
+      if (isSubnet) {
+        const subnet = Number(isSubnet[1]);
+        targets = await handler.getPoolTargets(subnet);
+      } else {
+        targets = await handler.getPoolTargets();
+      }
     }
     return targets;
   }
@@ -836,6 +869,18 @@ export default class EarningService {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }
   }
+  async handleYieldChangeValidator(params) {
+    await this.eventService.waitChainReady;
+    const {
+      slug
+    } = params;
+    const handler = this.getPoolHandler(slug);
+    if (handler) {
+      return handler.handleChangeEarningValidator(params);
+    } else {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
+    }
+  }
 
   /* Other */
 

package/services/history-service/index.js

@@ -74,7 +74,7 @@ export class HistoryService {
   /**
    * @todo: Must improve performance of this function
    * */
-  fetchSubscanTransactionHistory(chain, addresses) {
+  fetchSubscanTransactionHistory(chain, addresses, groupId) {
     if (!this.subscanService.checkSupportedSubscanChain(chain) || !addresses.length) {
       return;
     }
@@ -87,7 +87,7 @@ export class HistoryService {
     // However, fetchAllPossibleTransferItems-sent must run after fetchAllPossibleExtrinsicItems,
     // to avoid "duplicate Extrinsic Hash between items" problem
 
-    this.subscanService.fetchAllPossibleExtrinsicItems(chain, address, extrinsicItems => {
+    this.subscanService.fetchAllPossibleExtrinsicItems(groupId, chain, address, extrinsicItems => {
       const result = [];
       extrinsicItems.forEach(x => {
         const item = parseSubscanExtrinsicData(address, x, chainInfo);
@@ -105,7 +105,7 @@ export class HistoryService {
           excludeTransferExtrinsicHash.push(x.extrinsic_hash);
         }
       });
-      this.subscanService.fetchAllPossibleTransferItems(chain, address, 'sent').then(rsMap => {
+      this.subscanService.fetchAllPossibleTransferItems(groupId, chain, address, 'sent').then(rsMap => {
         const result = [];
         Object.keys(rsMap).forEach(hash => {
           // only push item that does not have same hash with another item
@@ -125,7 +125,7 @@ export class HistoryService {
     }).catch(e => {
       console.log('fetchAllPossibleExtrinsicItems error', e);
     });
-    this.subscanService.fetchAllPossibleTransferItems(chain, address, 'received').then(rsMap => {
+    this.subscanService.fetchAllPossibleTransferItems(groupId, chain, address, 'received').then(rsMap => {
       const result = [];
       Object.keys(rsMap).forEach(hash => {
         // only push item that does not have same hash with another item
@@ -172,14 +172,19 @@ export class HistoryService {
     const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
     const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const bitcoinAddresses = getAddressesByChainType(addresses, [ChainType.BITCOIN], chainInfo);
+    const groupId = this.subscanService.getGroupId();
     const subscription = this.historySubject.subscribe(items => {
       cb(items.filter(filterHistoryItemByAddressAndChain(chain, addresses)));
     });
+    const unsubscribe = () => {
+      subscription.unsubscribe();
+      this.subscanService.cancelGroupRequest(groupId);
+    };
     if (_isChainSubstrateCompatible(chainInfo)) {
       if (_isChainEvmCompatible(chainInfo)) {
-        this.fetchSubscanTransactionHistory(chain, evmAddresses);
+        this.fetchSubscanTransactionHistory(chain, evmAddresses, groupId);
       } else {
-        this.fetchSubscanTransactionHistory(chain, substrateAddresses);
+        this.fetchSubscanTransactionHistory(chain, substrateAddresses, groupId);
       }
     } else if (_isChainBitcoinCompatible(chainInfo)) {
       this.fetchBitcoinTransactionHistory(chain, bitcoinAddresses).catch(e => {
@@ -187,7 +192,7 @@ export class HistoryService {
       });
     }
     return {
-      unsubscribe: subscription.unsubscribe,
+      unsubscribe,
       value: this.historySubject.getValue().filter(filterHistoryItemByAddressAndChain(chain, addresses))
     };
   }