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

package/background/KoniTypes.d.ts

@@ -16,7 +16,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { BitcoinTransactionData, SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningSlippage, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningSlippage, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitChangeValidatorStaking, SubmitYieldJoinData, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitSignPsbtTransfer, RequestSubmitTransfer, RequestSubmitTransferWithId, RequestSubscribeTransfer, ResponseSubscribeTransfer, ResponseSubscribeTransferConfirmation } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -425,6 +425,7 @@ export declare enum ExtrinsicType {
     STAKING_CANCEL_COMPOUNDING = "staking.cancel_compounding",
     STAKING_CANCEL_UNSTAKE = "staking.cancel_unstake",
     JOIN_YIELD_POOL = "earn.join_pool",
+    CHANGE_EARNING_VALIDATOR = "earn.nominate",
     MINT_VDOT = "earn.mint_vdot",
     MINT_LDOT = "earn.mint_ldot",
     MINT_SDOT = "earn.mint_sdot",
@@ -458,6 +459,7 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.STAKING_LEAVE_POOL]: RequestYieldLeave;
     [ExtrinsicType.STAKING_BOND]: RequestStakePoolingBonding;
     [ExtrinsicType.STAKING_UNBOND]: RequestUnbondingSubmit;
+    [ExtrinsicType.CHANGE_EARNING_VALIDATOR]: SubmitChangeValidatorStaking;
     [ExtrinsicType.STAKING_CLAIM_REWARD]: RequestStakeClaimReward;
     [ExtrinsicType.STAKING_WITHDRAW]: RequestYieldWithdrawal;
     [ExtrinsicType.STAKING_COMPOUNDING]: RequestTuringStakeCompound;
@@ -1336,6 +1338,9 @@ export interface NominationInfo {
     validatorMinStake?: string;
     status: EarningStatus;
     originActiveStake?: string;
+    commission?: number;
+    expectedReturn?: number;
+    eraRewardPoint?: string;
 }
 export interface UnstakingInfo {
     chain: string;
@@ -1931,6 +1936,7 @@ export interface KoniRequestSignatures {
     'pri(yield.cancelWithdrawal.submit)': [RequestStakeCancelWithdrawal, SWTransactionResponse];
     'pri(yield.claimReward.submit)': [RequestStakeClaimReward, SWTransactionResponse];
     'pri(yield.getEarningSlippage)': [RequestEarningSlippage, EarningSlippageResult];
+    'pri(yield.changeValidator.submit)': [SubmitYieldJoinData, SWTransactionResponse];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transaction.history.subscribe)': [RequestSubscribeHistory, ResponseSubscribeHistory, TransactionHistoryItem[]];
     'pri(transfer.getMaxTransferable)': [RequestMaxTransferable, AmountData];

package/background/KoniTypes.js

@@ -84,6 +84,7 @@ export let ExtrinsicType;
   ExtrinsicType["STAKING_CANCEL_COMPOUNDING"] = "staking.cancel_compounding";
   ExtrinsicType["STAKING_CANCEL_UNSTAKE"] = "staking.cancel_unstake";
   ExtrinsicType["JOIN_YIELD_POOL"] = "earn.join_pool";
+  ExtrinsicType["CHANGE_EARNING_VALIDATOR"] = "earn.nominate";
   ExtrinsicType["MINT_VDOT"] = "earn.mint_vdot";
   ExtrinsicType["MINT_LDOT"] = "earn.mint_ldot";
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";

package/background/errors/TransactionError.js

@@ -87,6 +87,10 @@ const defaultErrorMap = {
     message: detectTranslate('Unable to fetch staking data. Re-enable current network and try again'),
     code: undefined
   },
+  [StakingTxErrorType.REMAINING_AMOUNT_TOO_LOW]: {
+    message: detectTranslate('Remaining amount too low'),
+    code: undefined
+  },
   [TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT]: {
     message: detectTranslate('Receiver is not enough existential deposit'),
     code: undefined

package/cjs/background/KoniTypes.js

@@ -99,6 +99,7 @@ exports.ExtrinsicType = ExtrinsicType;
   ExtrinsicType["STAKING_CANCEL_COMPOUNDING"] = "staking.cancel_compounding";
   ExtrinsicType["STAKING_CANCEL_UNSTAKE"] = "staking.cancel_unstake";
   ExtrinsicType["JOIN_YIELD_POOL"] = "earn.join_pool";
+  ExtrinsicType["CHANGE_EARNING_VALIDATOR"] = "earn.nominate";
   ExtrinsicType["MINT_VDOT"] = "earn.mint_vdot";
   ExtrinsicType["MINT_LDOT"] = "earn.mint_ldot";
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";

package/cjs/background/errors/TransactionError.js

@@ -92,6 +92,10 @@ const defaultErrorMap = {
     message: (0, _utils.detectTranslate)('Unable to fetch staking data. Re-enable current network and try again'),
     code: undefined
   },
+  [_types.StakingTxErrorType.REMAINING_AMOUNT_TOO_LOW]: {
+    message: (0, _utils.detectTranslate)('Remaining amount too low'),
+    code: undefined
+  },
   [_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT]: {
     message: (0, _utils.detectTranslate)('Receiver is not enough existential deposit'),
     code: undefined

package/cjs/core/logic-validation/transfer.js

@@ -204,6 +204,13 @@ function checkSupportForAction(validationResponse, blockedActionsMap) {
         currentAction = `${extrinsicType}___${chain}`;
         break;
       }
+    case _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
     case _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD:
       {
         const data = validationResponse.data;

package/cjs/koni/api/nft/config.js

@@ -100,7 +100,7 @@ const IPFS2_RMRK = 'https://ipfs2.rmrk.link/ipfs/'; // ????
 exports.IPFS2_RMRK = IPFS2_RMRK;
 const IPFS_ETH_ARAGON = 'https://ipfs.eth.aragon.network/ipfs/'; // 400
 exports.IPFS_ETH_ARAGON = IPFS_ETH_ARAGON;
-const SUBWALLET_IPFS = 'https://ipfs.subwallet.app/ipfs/'; // ???
+const SUBWALLET_IPFS = 'https://ipfs-files.subwallet.app/ipfs/'; // ???
 exports.SUBWALLET_IPFS = SUBWALLET_IPFS;
 let SUPPORTED_NFT_NETWORKS;
 exports.SUPPORTED_NFT_NETWORKS = SUPPORTED_NFT_NETWORKS;

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

@@ -4061,6 +4061,25 @@ class KoniExtension {
     const slippage = await this.#koniState.earningService.yieldGetEarningSlippage(params);
     return slippage;
   }
+  async handleYieldChangeValidator(params) {
+    const {
+      address,
+      slug
+    } = params;
+    const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
+    if (!poolHandler) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
+    }
+    const extrinsic = await this.#koniState.earningService.handleYieldChangeValidator(params);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain: poolHandler.chain,
+      transaction: extrinsic,
+      data: params,
+      extrinsicType: _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR,
+      chainType: _KoniTypes.ChainType.SUBSTRATE
+    });
+  }
 
   /* Campaign */
 
@@ -4935,7 +4954,8 @@ class KoniExtension {
         return await this.yieldSubmitClaimReward(request);
       case 'pri(yield.getEarningSlippage)':
         return await this.yieldGetEarningSlippage(request);
-
+      case 'pri(yield.changeValidator.submit)':
+        return await this.handleYieldChangeValidator(request);
       /* Others */
 
       /* Actions */

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

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

@@ -689,15 +689,20 @@ class ChainService {
     const priorityTokensMap = this.priorityTokensSubject.value || {};
     const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
     for (const assetSlug of priorityTokensList) {
-      const assetState = assetSettings[assetSlug];
       const assetInfo = this.getAssetBySlug(assetSlug);
+
+      // This can occur if the assetSlug is not present in the current chainlist version
+      if (!assetInfo) {
+        continue;
+      }
+      const assetState = assetSettings[assetSlug];
       const chainState = chainStateMap[assetInfo.originChain];
       if (!assetState) {
         // If this asset not has asset setting, this token is not enabled before (not turned off before)
         if (!chainState || !chainState.manualTurnOff) {
           await this.updateAssetSetting(assetSlug, {
             visible: true
-          }, true);
+          }, false);
         }
       }
     }

package/cjs/services/earning-service/constants/chains.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
+exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -41,4 +41,6 @@ exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = MANTA_VALIDATOR_POINTS_PER_BLOCK;
 const MANTA_MIN_DELEGATION = 500;
 exports.MANTA_MIN_DELEGATION = MANTA_MIN_DELEGATION;
 const CHANNEL_ID = 7;
-exports.CHANNEL_ID = CHANNEL_ID;
+exports.CHANNEL_ID = CHANNEL_ID;
+const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];
+exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = _SUPPORT_CHANGE_VALIDATOR_CHAIN;

package/cjs/services/earning-service/handlers/lending/interlay.js

@@ -27,7 +27,8 @@ class InterlayLendingPoolHandler extends _base.default {
     fastUnstake: true,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   rateDecimals = 18;
   constructor(state, chain) {

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

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

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

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

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

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

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

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

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

@@ -47,7 +47,8 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
 
   /* Subscribe pool info */

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

@@ -21,7 +21,8 @@ class BaseNativeStakingPoolHandler extends _base.default {
     fastUnstake: false,
     cancelUnstake: true,
     withdraw: true,
-    claimReward: false
+    claimReward: false,
+    changeValidator: false
   };
   static generateSlug(symbol, chain) {
     return `${symbol}___native_staking___${chain}`;
@@ -172,6 +173,9 @@ class BaseNativeStakingPoolHandler extends _base.default {
   async handleYieldClaimReward(address, bondReward) {
     return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
   }
+  async handleChangeEarningValidator(_data) {
+    return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
+  }
 
   /* Other actions */
 }

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

@@ -16,13 +16,12 @@ var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
-var _utils4 = require("../../utils");
 var _tao = require("./tao");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 const DEFAULT_BITTENSOR_SLIPPAGE = 0.005;
-const DEFAULT_DTAO_MINBOND = '600000';
+const DEFAULT_DTAO_MINBOND = '21000000';
 exports.DEFAULT_DTAO_MINBOND = DEFAULT_DTAO_MINBOND;
 const getAlphaToTaoMapping = async substrateApi => {
   const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
@@ -70,7 +69,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: true
   };
   constructor(state, chain) {
     super(state, chain);
@@ -401,32 +401,37 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
       isCrowded: false
     }));
   }
-  async getMainnetPoolTargets() {
+  async getMainnetPoolTargets(netuid) {
     const _topValidator = await this.bittensorCache.get();
     const topValidator = _topValidator;
     const bnMinBond = new _bignumber.default(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 _bignumber.default(validatorList[i].stake);
-      const bnOwnStake = new _bignumber.default(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 _bignumber.default(validator.global_weighted_stake);
+      const bnRootWeightStake = new _bignumber.default(validator.weighted_root_stake);
+      const bnAlphaStake = new _bignumber.default(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 = (0, _utils4.calculateReward)(parseFloat(apr));
-      const name = validatorList[i].name || address;
+      const apr = aprMap[address];
+      const expectedReturn = apr ? new _bignumber.default(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,
@@ -436,10 +441,10 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     }));
     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();
     }
@@ -456,6 +461,9 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
       selectedValidators: targetValidators,
       subnetData
     } = data;
+    if (!subnetData) {
+      throw new Error(_types.BasicTxErrorType.INVALID_PARAMS);
+    }
     const {
       netuid,
       slippage
@@ -465,6 +473,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 + (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
     const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.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);
@@ -473,6 +483,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
       amount: '0'
     }];
   }
+
+  // Validate for case stake more
   async validateYieldJoin(data, path) {
     const baseErrors = await super.validateYieldJoin(data, path);
     if (baseErrors.length > 0) {
@@ -524,5 +536,46 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
   }
 
   /* 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.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
+    }
+    const {
+      netuid
+    } = subnetData;
+    const selectedValidatorInfo = targetValidators[0];
+    const destValidator = selectedValidatorInfo.address;
+    if (new _bignumber.default(amount).lte(0)) {
+      return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Amount must be greater than 0')));
+    }
+    if (originValidator === destValidator) {
+      return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'From validator is the same with to validator'));
+    }
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const minUnstake = new _bignumber.default(DEFAULT_DTAO_MINBOND).dividedBy(alphaToTaoPrice);
+    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(_bignumber.default.ROUND_CEIL).dividedBy(1000);
+    const bnMinUnstake = formattedMinUnstake.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken));
+    if (new _bignumber.default(maxAmount).lt(bnMinUnstake)) {
+      return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.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 _bignumber.default(maxAmount).minus(new _bignumber.default(amount)).lt(bnMinUnstake)) {
+      return Promise.reject(new _TransactionError.TransactionError(_types.StakingTxErrorType.REMAINING_AMOUNT_TOO_LOW, (0, _i18next.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 ${(0, _utils3.formatNumber)(maxAmount, (0, _utils2._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;
+  }
 }
 exports.default = SubnetTaoStakingPoolHandler;

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

@@ -37,7 +37,8 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
 
   /* Subscribe pool info */

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

@@ -22,6 +22,24 @@ var _base = _interopRequireDefault(require("./base"));
 // SPDX-License-Identifier: Apache-2.0
 
 class RelayNativeStakingPoolHandler extends _base.default {
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: false,
+    cancelUnstake: true,
+    withdraw: true,
+    claimReward: false,
+    changeValidator: false
+  };
+  constructor(state, chain) {
+    super(state, chain);
+    if (_constants2._SUPPORT_CHANGE_VALIDATOR_CHAIN.includes(chain)) {
+      this.availableMethod = {
+        ...this.availableMethod,
+        changeValidator: true
+      };
+    }
+  }
   /* Subscribe pool info */
 
   async subscribePoolInfo(callback) {
@@ -676,13 +694,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
     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 {
@@ -690,7 +706,18 @@ class RelayNativeStakingPoolHandler extends _base.default {
       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.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
+    }
+    const validatorParamList = selectedValidators.map(validator => validator.address);
+    const nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
+    return nominateTx;
+  }
   /* Other actions */
 }
 exports.default = RelayNativeStakingPoolHandler;