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

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

@@ -17,8 +17,6 @@ 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 _dtao = require("./dtao");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -49,7 +47,7 @@ class BittensorCache {
   }
   async fetchData() {
     try {
-      const resp = await (0, _utils3.fetchFromProxyService)(_environment.ProxyServiceRoute.BITTENSOR, '/validator/latest/v1?limit=50', {
+      const resp = await (0, _utils3.fetchFromProxyService)(_environment.ProxyServiceRoute.BITTENSOR, '/dtao/validator/latest/v1?limit=100', {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json'
@@ -63,7 +61,7 @@ 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;
@@ -86,6 +84,27 @@ class BittensorCache {
       };
     }
   }
+  async fetchApr(netuid) {
+    try {
+      const resp = await (0, _utils3.fetchFromProxyService)(_environment.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> {
@@ -124,7 +143,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: false,
-    claimReward: false
+    claimReward: false,
+    changeValidator: true
   };
   constructor(state, chain) {
     super(state, chain);
@@ -160,23 +180,18 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         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 _bignumber.default(taoIn);
         const BNminDelegatorStake = new _bignumber.default(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((0, _utils3.formatNumber)(BNminDelegatorStake, (0, _utils2._getAssetDecimals)(this.nativeToken)))
           },
           statistic: {
             assetEarning: [{
@@ -423,27 +438,32 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
     const bnMinBond = new _bignumber.default(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 _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(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 _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,
@@ -481,6 +501,8 @@ class TaoNativeStakingPoolHandler 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) {
@@ -489,8 +511,10 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const {
       amount
     } = data;
-    if (new _bignumber.default(amount).lt(new _bignumber.default(_dtao.DEFAULT_DTAO_MINBOND))) {
-      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Insufficient stake. You need to stake at least ${(0, _utils3.formatNumber)(_dtao.DEFAULT_DTAO_MINBOND, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)} to earn rewards`))];
+    const minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinStake = minDelegatorStake.toString();
+    if (new _bignumber.default(amount).lt(bnMinStake)) {
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Insufficient stake. You need to stake at least ${(0, _utils3.formatNumber)(bnMinStake, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)} to earn rewards`))];
     }
     return baseErrors;
   }
@@ -517,7 +541,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     if (!poolInfo) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS)];
     }
-    const bnMinUnstake = new _bignumber.default(_dtao.DEFAULT_DTAO_MINBOND);
+    const minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinUnstake = new _bignumber.default(minDelegatorStake.toString());
     if (new _bignumber.default(amount).lt(bnMinUnstake)) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Amount too low. You need to unstake at least ${(0, _utils3.formatNumber)(bnMinUnstake, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)}`))];
     }
@@ -525,5 +550,41 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
   }
 
   /* 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.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
+    }
+
+    // Bittensor only supports changing 1 validator at a time, not multiple
+    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 minDelegatorStake = (await this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
+    const bnMinMoveStake = new _bignumber.default(minDelegatorStake.toString());
+    if (new _bignumber.default(maxAmount).lt(bnMinMoveStake)) {
+      return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Amount too low. You need to move at least ${(0, _utils3.formatNumber)(bnMinMoveStake, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)}`)));
+    }
+
+    // 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(bnMinMoveStake)) {
+      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))} ${(0, _utils2._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;
+  }
 }
 exports.default = TaoNativeStakingPoolHandler;

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

@@ -27,7 +27,8 @@ class NominationPoolHandler extends _base.default {
     fastUnstake: false,
     cancelUnstake: false,
     withdraw: true,
-    claimReward: true
+    claimReward: true,
+    changeValidator: false
   };
   static generateSlug(symbol, chain) {
     return `${symbol}___nomination_pool___${chain}`;
@@ -584,7 +585,9 @@ class NominationPoolHandler extends _base.default {
       });
     }
   }
-
+  handleChangeEarningValidator(data) {
+    return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
+  }
   /* Other actions */
 }
 exports.default = NominationPoolHandler;

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

@@ -519,7 +519,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
   handleYieldWithdraw(address, unstakingInfo) {
     return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
   }
-
+  handleChangeEarningValidator(data) {
+    return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
+  }
   /* Other actions */
 }
 exports.default = BaseSpecialStakingPoolHandler;

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

@@ -384,7 +384,13 @@ 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;
   }
@@ -724,7 +730,13 @@ 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;
   }
@@ -867,6 +879,18 @@ class EarningService {
       return Promise.reject(new _TransactionError.TransactionError(_types2.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.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR));
+    }
+  }
 
   /* Other */
 

package/cjs/services/transaction-service/helpers/index.js

@@ -73,6 +73,8 @@ const typeName = type => {
       return 'Withdraw pool';
     case _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL:
       return 'Start earning';
+    case _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR:
+      return 'Change validator';
     case _KoniTypes.ExtrinsicType.UNKNOWN:
     default:
       return 'unknown';

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

@@ -916,6 +916,21 @@ class TransactionService {
           };
           break;
         }
+      case _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR:
+        {
+          var _data$metadata;
+          const data = (0, _utils3.parseTransactionData)(transaction.data);
+          historyItem.additionalInfo = {
+            symbol: ((_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.subnetSymbol) || ''
+          };
+          if (data.amount !== '0') {
+            historyItem.amount = {
+              ...baseNativeAmount,
+              value: data.amount
+            };
+          }
+          break;
+        }
       case _KoniTypes.ExtrinsicType.EVM_EXECUTE:
         {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

package/cjs/types/transaction/error.js

@@ -41,6 +41,7 @@ exports.StakingTxErrorType = StakingTxErrorType;
   StakingTxErrorType["INACTIVE_NOMINATION_POOL"] = "INACTIVE_NOMINATION_POOL";
   StakingTxErrorType["CAN_NOT_GET_METADATA"] = "CAN_NOT_GET_METADATA";
   StakingTxErrorType["NOT_ENOUGH_MIN_UNSTAKE"] = "NOT_ENOUGH_MIN_UNSTAKE";
+  StakingTxErrorType["REMAINING_AMOUNT_TOO_LOW"] = "REMAINING_AMOUNT_TOO_LOW";
 })(StakingTxErrorType || (exports.StakingTxErrorType = StakingTxErrorType = {}));
 let TransferTxErrorType;
 exports.TransferTxErrorType = TransferTxErrorType;

package/cjs/utils/account/transform.js

@@ -154,7 +154,7 @@ const BASE_TRANSFER_ACTIONS = [_KoniTypes.ExtrinsicType.TRANSFER_BALANCE, _KoniT
 const NATIVE_STAKE_ACTIONS = [_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW,
 // ExtrinsicType.STAKING_COMPOUNDING,
 // ExtrinsicType.STAKING_CANCEL_COMPOUNDING,
-_KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE];
+_KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.CHANGE_EARNING_VALIDATOR];
 const POOL_STAKE_ACTIONS = [_KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL];
 const EARN_VDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_VDOT, _KoniTypes.ExtrinsicType.REDEEM_VDOT, _KoniTypes.ExtrinsicType.UNSTAKE_VDOT];
 const EARN_LDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.REDEEM_LDOT, _KoniTypes.ExtrinsicType.UNSTAKE_LDOT];
@@ -402,8 +402,9 @@ const convertAccountProxyType = accountSignMode => {
       return _types2.AccountProxyType.ALL_ACCOUNT;
     case _types2.AccountSignMode.UNKNOWN:
       return _types2.AccountProxyType.UNKNOWN;
+    default:
+      return _types2.AccountProxyType.UNKNOWN;
   }
-  return _types2.AccountProxyType.UNKNOWN;
 };
 exports.convertAccountProxyType = convertAccountProxyType;
 const _combineAccounts = (accounts, modifyPairs, accountProxies) => {

package/core/logic-validation/transfer.js

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

package/koni/api/nft/config.d.ts

@@ -32,7 +32,7 @@ export declare const IPFS_FLEEK = "https://ipfs.fleek.co/ipfs/";
 export declare const W3S_IPFS = "https://w3s.link/ipfs/";
 export declare const IPFS2_RMRK = "https://ipfs2.rmrk.link/ipfs/";
 export declare const IPFS_ETH_ARAGON = "https://ipfs.eth.aragon.network/ipfs/";
-export declare const SUBWALLET_IPFS = "https://ipfs.subwallet.app/ipfs/";
+export declare const SUBWALLET_IPFS = "https://ipfs-files.subwallet.app/ipfs/";
 export declare enum SUPPORTED_NFT_NETWORKS {
     karura = "karura",
     acala = "acala",

package/koni/api/nft/config.js

@@ -62,7 +62,7 @@ export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
 export const W3S_IPFS = 'https://w3s.link/ipfs/'; // 400
 export const IPFS2_RMRK = 'https://ipfs2.rmrk.link/ipfs/'; // ????
 export const IPFS_ETH_ARAGON = 'https://ipfs.eth.aragon.network/ipfs/'; // 400
-export const SUBWALLET_IPFS = 'https://ipfs.subwallet.app/ipfs/'; // ???
+export const SUBWALLET_IPFS = 'https://ipfs-files.subwallet.app/ipfs/'; // ???
 
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {

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

@@ -253,6 +253,7 @@ export default class KoniExtension {
     private yieldSubmitCancelWithdrawal;
     private yieldSubmitClaimReward;
     private yieldGetEarningSlippage;
+    private handleYieldChangeValidator;
     private unlockDotCheckCanMint;
     private unlockDotSubscribeMintedData;
     private subscribeProcessingBanner;

package/koni/background/handlers/Extension.js

@@ -3970,6 +3970,25 @@ export default 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(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: ExtrinsicType.CHANGE_EARNING_VALIDATOR,
+      chainType: ChainType.SUBSTRATE
+    });
+  }
 
   /* Campaign */
 
@@ -4839,7 +4858,8 @@ export default 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/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.47-0",
+  "version": "1.3.48-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2865,13 +2865,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.109",
-    "@subwallet/extension-base": "^1.3.47-0",
-    "@subwallet/extension-chains": "^1.3.47-0",
-    "@subwallet/extension-dapp": "^1.3.47-0",
-    "@subwallet/extension-inject": "^1.3.47-0",
+    "@subwallet/chain-list": "0.2.108-beta.15",
+    "@subwallet/extension-base": "^1.3.48-0",
+    "@subwallet/extension-chains": "^1.3.48-0",
+    "@subwallet/extension-dapp": "^1.3.48-0",
+    "@subwallet/extension-inject": "^1.3.48-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.47-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.48-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.47-0'
+  version: '1.3.48-0'
 };

package/services/chain-service/index.js

@@ -667,15 +667,20 @@ export 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/services/earning-service/constants/chains.d.ts

@@ -22,3 +22,4 @@ export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export declare const MANTA_MIN_DELEGATION = 500;
 export declare const CHANNEL_ID = 7;
+export declare const _SUPPORT_CHANGE_VALIDATOR_CHAIN: string[];

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

@@ -28,4 +28,5 @@ export const MaxEraRewardPointsEras = 14;
 export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
 export const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export const MANTA_MIN_DELEGATION = 500;
-export const CHANNEL_ID = 7;
+export const CHANNEL_ID = 7;
+export const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];

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

@@ -3,7 +3,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BasePoolInfo, BaseYieldPoolMetadata, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BasePoolInfo, BaseYieldPoolMetadata, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { EarningSlippageResult } from './native-staking/dtao';
 /**
  * @class BasePoolHandler
@@ -27,7 +27,7 @@ export default abstract class BasePoolHandler {
     /** Pool's transaction type */
     readonly transactionChainType: ChainType;
     /** Pool's available method */
-    protected abstract readonly availableMethod: YieldPoolMethodInfo;
+    abstract readonly availableMethod: YieldPoolMethodInfo;
     /**
      * @constructor
      * @param {KoniState} state - Koni state
@@ -61,7 +61,7 @@ export default abstract class BasePoolHandler {
     /** Get pool reward history */
     abstract getPoolRewardHistory(useAddresses: string[], callback: (rs: EarningRewardHistoryItem) => void): Promise<VoidFunction>;
     /** Get pool target */
-    abstract getPoolTargets(): Promise<YieldPoolTarget[]>;
+    abstract getPoolTargets(netuid?: number): Promise<YieldPoolTarget[]>;
     earlyValidate(request: RequestEarlyValidateYield): Promise<ResponseEarlyValidateYield>;
     /**
      * @function firstStepFee
@@ -113,6 +113,8 @@ export default abstract class BasePoolHandler {
     abstract handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
     /** Create `transaction` to claim reward */
     abstract handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
+    /** Change earning validator */
+    abstract handleChangeEarningValidator(data: SubmitChangeValidatorStaking): Promise<TransactionData>;
     /** Check handler can handle slug */
     canHandleSlug(slug: string): boolean;
     getEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;

package/services/earning-service/handlers/lending/interlay.d.ts

@@ -11,7 +11,7 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     protected readonly rateDecimals = 18;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;

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

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

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

@@ -12,7 +12,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     protected readonly feeAssets: string[];
     readonly minAmountPercent = 0.98;
     protected readonly rateDecimals = 10;
-    protected readonly availableMethod: YieldPoolMethodInfo;
+    readonly availableMethod: YieldPoolMethodInfo;
     slug: string;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;

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);