@subwallet/extension-base 1.3.29-1 → 1.3.31-0

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AssetSetting, MetadataItem, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { AssetSetting, MetadataItem, SufficientChainsDetails, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -32,6 +32,7 @@ export declare class ChainService {
     private chainLogoMapSubject;
     private ledgerGenericAllowChainsSubject;
     private priorityTokensSubject;
+    private sufficientChainsSubject;
     private store;
     private assetSettingSubject;
     private logger;
@@ -39,10 +40,12 @@ export declare class ChainService {
     get value(): {
         readonly ledgerGenericAllowChains: string[];
         readonly priorityTokens: TokenPriorityDetails;
+        readonly sufficientChains: SufficientChainsDetails;
     };
     get observable(): {
         readonly ledgerGenericAllowChains: import("rxjs").Observable<string[]>;
         readonly priorityTokens: import("rxjs").Observable<TokenPriorityDetails>;
+        readonly sufficientChains: import("rxjs").Observable<SufficientChainsDetails>;
     };
     subscribeSwapRefMap(): Subject<Record<string, _AssetRef>>;
     get xcmRefMap(): Record<string, _AssetRef>;
@@ -111,8 +114,10 @@ export declare class ChainService {
     stopCheckLatestChainData(): void;
     handleLatestChainData(latestChainInfo: _ChainInfo[]): void;
     autoEnableTokens(): Promise<void>;
+    enablePopularTokens(): Promise<void>;
     handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains: string[]): void;
     handleLatestPriorityTokens(latestPriorityTokens: TokenPriorityDetails): void;
+    handleLatestSufficientChains(latestSufficientChains: SufficientChainsDetails): void;
     handleLatestData(): void;
     private initApis;
     initSingleApi(slug: string): Promise<boolean>;
@@ -127,6 +132,7 @@ export declare class ChainService {
     private fetchLatestPriceIdsData;
     private fetchLatestLedgerGenericAllowChains;
     private fetchLatestPriorityTokens;
+    private fetchLatestSufficientChains;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;
@@ -148,13 +154,14 @@ export declare class ChainService {
     refreshEvmApi(slug: string): void;
     stopAllChainApis(): Promise<void>;
     resumeAllChainApis(): Promise<void>;
-    initAssetSettings(): Promise<void>;
+    initAssetSettings(): void;
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     setMantaZkAssetSettings(visible: boolean): void;
     getStoreAssetSettings(): Promise<Record<string, AssetSetting>>;
     getAssetSettings(): Promise<Record<string, AssetSetting>>;
     updateAssetSetting(assetSlug: string, assetSetting: AssetSetting, autoEnableNativeToken?: boolean): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
+    updatePriorityAssetsByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
     getAssetLogoMap(): Record<string, string>;
     subscribeAssetLogoMap(): BehaviorSubject<Record<string, string>>;

package/services/chain-service/index.js

@@ -11,7 +11,7 @@ import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-
 import { TonChainHandler } from '@subwallet/extension-base/services/chain-service/handler/TonChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { MYTHOS_MIGRATION_KEY } from '@subwallet/extension-base/services/migration-service/scripts';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
@@ -50,6 +50,7 @@ export class ChainService {
   chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
   ledgerGenericAllowChainsSubject = new BehaviorSubject([]);
   priorityTokensSubject = new BehaviorSubject({});
+  sufficientChainsSubject = new BehaviorSubject({});
 
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
@@ -75,24 +76,32 @@ export class ChainService {
   get value() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
     const priorityTokens = this.priorityTokensSubject;
+    const sufficientChains = this.sufficientChainsSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.value;
       },
       get priorityTokens() {
         return priorityTokens.value;
+      },
+      get sufficientChains() {
+        return sufficientChains.value;
       }
     };
   }
   get observable() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
     const priorityTokens = this.priorityTokensSubject;
+    const sufficientChains = this.sufficientChainsSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.asObservable();
       },
       get priorityTokens() {
         return priorityTokens.asObservable();
+      },
+      get sufficientChains() {
+        return sufficientChains.asObservable();
       }
     };
   }
@@ -526,7 +535,7 @@ export class ChainService {
     this.initAssetRefMap();
     this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
-    await this.initAssetSettings();
+    this.initAssetSettings();
     await this.autoEnableTokens();
   }
   initAssetRefMap() {
@@ -605,14 +614,47 @@ export class ChainService {
       }
     }
   }
+  async enablePopularTokens() {
+    const assetSettings = this.assetSettingSubject.value;
+    const chainStateMap = this.getChainStateMap();
+    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);
+      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);
+        }
+      }
+    }
+  }
   handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains) {
     this.ledgerGenericAllowChainsSubject.next(latestledgerGenericAllowChains);
     this.eventService.emit('ledger.ready', true);
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
   handleLatestPriorityTokens(latestPriorityTokens) {
+    const currentTokens = this.priorityTokensSubject.value || {};
     this.priorityTokensSubject.next(latestPriorityTokens);
     this.logger.log('Finished updating latest popular tokens');
+    const currentTokenKeys = Object.keys(currentTokens.token || {}); // Extract keys from current tokens
+    const newTokenKeys = Object.keys(latestPriorityTokens.token || {}); // Extract keys from new tokens
+
+    if (JSON.stringify(currentTokenKeys) !== JSON.stringify(newTokenKeys)) {
+      // Check if token keys have changed
+      this.enablePopularTokens().then(() => this.logger.log('Popular tokens enabled due to priority tokens change')) // Log success after enabling tokens
+      .catch(e => console.error('Error enabling popular tokens:', e)); // Log error if enabling fails
+    }
+  }
+
+  handleLatestSufficientChains(latestSufficientChains) {
+    this.sufficientChainsSubject.next(latestSufficientChains);
+    this.logger.log('Finished updating latest supported sufficient chains');
   }
   handleLatestData() {
     this.fetchLatestChainData().then(latestChainInfo => {
@@ -634,6 +676,9 @@ export class ChainService {
     this.fetchLatestPriorityTokens().then(latestPriorityTokens => {
       this.handleLatestPriorityTokens(latestPriorityTokens);
     }).catch(console.error);
+    this.fetchLatestSufficientChains().then(latestSufficientChains => {
+      this.handleLatestSufficientChains(latestSufficientChains);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -913,6 +958,9 @@ export class ChainService {
       token: {}
     };
   }
+  async fetchLatestSufficientChains() {
+    return (await fetchStaticData('chains/supported-sufficient-chains')) || [];
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap, ignoredList);
@@ -1616,22 +1664,7 @@ export class ChainService {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp(), this.tonChainHandler.wakeUp(), this.cardanoChainHandler.wakeUp()]);
     this.checkLatestData();
   }
-  async initAssetSettings() {
-    const assetSettings = await this.getAssetSettings();
-    const activeChainSlugs = this.getActiveChainSlugs();
-    const assetRegistry = this.getAssetRegistry();
-    Object.values(assetRegistry).forEach(assetInfo => {
-      const isSettingExisted = (assetInfo.slug in assetSettings);
-
-      // Set visible for every enabled chains
-      if (activeChainSlugs.includes(assetInfo.originChain) && !isSettingExisted) {
-        // Setting only exist when set either by chain settings or user
-        assetSettings[assetInfo.slug] = {
-          visible: true
-        };
-      }
-    });
-    this.setAssetSettings(assetSettings, false);
+  initAssetSettings() {
     this.eventService.emit('asset.ready', true);
   }
   setAssetSettings(assetSettings, emitEvent = true) {
@@ -1719,6 +1752,27 @@ export class ChainService {
     });
     this.setAssetSettings(assetSettings);
   }
+  async updatePriorityAssetsByChain(chainSlug, visible) {
+    const currentAssetSettings = await this.getAssetSettings();
+    const assetsByChain = this.getFungibleTokensByChain(chainSlug);
+    const priorityTokensMap = this.priorityTokensSubject.value || {};
+    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
+    for (const asset of Object.values(assetsByChain)) {
+      if (visible) {
+        const isPriorityToken = priorityTokensList.includes(asset.slug);
+        if (isPriorityToken || _isNativeToken(asset)) {
+          currentAssetSettings[asset.slug] = {
+            visible: true
+          };
+        }
+      } else {
+        currentAssetSettings[asset.slug] = {
+          visible: false
+        };
+      }
+    }
+    this.setAssetSettings(currentAssetSettings);
+  }
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.102'; // update this when build chainlist
+const ChainListVersion = '0.2.103'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

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

@@ -4,6 +4,7 @@ import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/K
 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 { EarningSlippageResult } from './native-staking/dtao';
 /**
  * @class BasePoolHandler
  * @description Base pool handler
@@ -101,11 +102,11 @@ export default abstract class BasePoolHandler {
     /** Validate param to leave the pool */
     abstract validateYieldLeave(amount: string, address: string, fastLeave: boolean, selectedTarget?: string, slug?: string, poolInfo?: YieldPoolInfo): Promise<TransactionError[]>;
     /** Create `transaction` to leave the pool normal (default unstake) */
-    protected abstract handleYieldUnstake(amount: string, address: string, selectedTarget?: string, netuid?: number): Promise<[ExtrinsicType, TransactionData]>;
+    protected abstract handleYieldUnstake(amount: string, address: string, selectedTarget?: string, netuid?: number, slippage?: number): Promise<[ExtrinsicType, TransactionData]>;
     /** Create `transaction` to leave the pool fast (swap token) */
     protected abstract handleYieldRedeem(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
     /** Create `transaction` to leave the pool */
-    handleYieldLeave(fastLeave: boolean, amount: string, address: string, selectedTarget?: string, netuid?: number): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldLeave(fastLeave: boolean, amount: string, address: string, selectedTarget?: string, netuid?: number, slippage?: number): Promise<[ExtrinsicType, TransactionData]>;
     /** Create `transaction` to withdraw unstaked amount */
     abstract handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     /** Create `transaction` to cancel unstake */
@@ -114,5 +115,5 @@ export default abstract class BasePoolHandler {
     abstract handleYieldClaimReward(address: string, bondReward?: boolean): Promise<TransactionData>;
     /** Check handler can handle slug */
     canHandleSlug(slug: string): boolean;
-    getEarningSlippage(params: RequestEarningSlippage): Promise<number>;
+    getEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
 }

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

@@ -7,7 +7,6 @@ import { DEFAULT_YIELD_FIRST_STEP } from '@subwallet/extension-base/services/ear
 import { createClaimNotification, createWithdrawNotifications } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_TEN } from '@polkadot/util';
-
 /**
  * @class BasePoolHandler
  * @description Base pool handler
@@ -249,11 +248,11 @@ export default class BasePoolHandler {
   /** Validate param to join the pool */
 
   /** Create `transaction` to leave the pool */
-  async handleYieldLeave(fastLeave, amount, address, selectedTarget, netuid) {
+  async handleYieldLeave(fastLeave, amount, address, selectedTarget, netuid, slippage) {
     if (fastLeave) {
       return this.handleYieldRedeem(amount, address, selectedTarget);
     } else {
-      return this.handleYieldUnstake(amount, address, selectedTarget, netuid);
+      return this.handleYieldUnstake(amount, address, selectedTarget, netuid, slippage);
     }
   }
 
@@ -268,7 +267,10 @@ export default class BasePoolHandler {
     return this.slug === slug;
   }
   getEarningSlippage(params) {
-    return Promise.resolve(0);
+    return Promise.resolve({
+      slippage: 0,
+      rate: 1
+    });
   }
   /* Other actions */
 }

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

@@ -102,7 +102,10 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
       address,
       slug,
       selectedValidators,
-      netuid
+      subnetData: {
+        netuid: netuid || 0,
+        slippage: 0
+      }
     };
     const positionInfo = await this.getPoolPosition(address);
     const [, fee] = await this.createJoinExtrinsic(data, positionInfo);

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

@@ -2,10 +2,9 @@ import { _ChainInfo } from '@subwallet/chain-list/types';
 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 { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BaseYieldPositionInfo, OptimalYieldPath, RequestEarningSlippage, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
-import { BigNumber } from 'bignumber.js';
+import BigN from 'bignumber.js';
 export interface SubnetData {
     netuid: number;
     name: string;
@@ -13,11 +12,12 @@ export interface SubnetData {
     ownerHotkey: string;
     maxAllowedValidators: number;
     taoIn: number;
+    taoInEmission: number;
 }
 interface TaoStakingStakeOption {
     owner: string;
     amount: string;
-    rate?: BigNumber;
+    rate?: BigN;
     identity?: string;
 }
 export interface RawDelegateState {
@@ -36,8 +36,11 @@ export interface TestnetBittensorDelegateInfo {
     nominators: Nominators;
     returnPer1000: number;
 }
+export interface EarningSlippageResult {
+    slippage: number;
+    rate: number;
+}
 export declare const DEFAULT_DTAO_MINBOND = "600000";
-export declare const getAlphaToTaoMapping: (substrateApi: _SubstrateApi) => Promise<Record<number, string>>;
 export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHandler {
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
@@ -51,7 +54,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);
     canHandleSlug(slug: string): boolean;
-    getEarningSlippage(params: RequestEarningSlippage): Promise<number>;
+    getEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
     get maintainBalance(): string;
     private init;
     protected getDescription(): string;
@@ -63,7 +66,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     getPoolTargets(): Promise<ValidatorInfo[]>;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;
     validateYieldJoin(data: SubmitJoinNativeStaking, path: OptimalYieldPath): Promise<TransactionError[]>;
-    handleYieldUnstake(amount: string, address: string, selectedTarget?: string, netuid?: number): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldUnstake(amount: string, address: string, selectedTarget?: string, netuid?: number, slippage?: number): Promise<[ExtrinsicType, TransactionData]>;
     validateYieldLeave(amount: string, address: string, fastLeave: boolean, selectedTarget?: string, slug?: string, poolInfo?: YieldPoolInfo): Promise<TransactionError[]>;
 }
 export {};

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

@@ -9,31 +9,38 @@ import { _getAssetDecimals, _getAssetSymbol } from '@subwallet/extension-base/se
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BasicTxErrorType, EarningStatus, YieldPoolType } from '@subwallet/extension-base/types';
 import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
-import BigN, { BigNumber } from 'bignumber.js';
+import BigN from 'bignumber.js';
 import { t } from 'i18next';
-import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
+import { BN, BN_ZERO } from '@polkadot/util';
 import { calculateReward } from "../../utils/index.js";
 import { BittensorCache } from "./tao.js";
 const DEFAULT_BITTENSOR_SLIPPAGE = 0.005;
 export const DEFAULT_DTAO_MINBOND = '600000';
-export const getAlphaToTaoMapping = async substrateApi => {
+const getAlphaToTaoMapping = async substrateApi => {
   const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
-  if (!allSubnets) {
+  if (!allSubnets || allSubnets.length === 0) {
     return {};
   }
-  return allSubnets.reduce((acc, subnet) => {
+  const result = Object.create(null);
+  for (const subnet of allSubnets) {
     const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    if (netuid === undefined) {
+      continue;
+    }
     const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new BigN(subnet.taoIn) : new BigN(0);
     const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new BigN(subnet.alphaIn) : new BigN(0);
-    if (netuid === 0) {
-      acc[netuid] = '1';
-    } else if (alphaIn.gt(0)) {
-      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
-    } else {
-      acc[netuid] = '1';
-    }
-    return acc;
-  }, {});
+    result[netuid] = netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
+  }
+  return result;
+};
+const getAlphaToTaoRate = async (substrateApi, netuid) => {
+  const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(netuid)).toJSON();
+  if (!subnetInfo) {
+    return '1';
+  }
+  const taoIn = subnetInfo.taoIn ? new BigN(subnetInfo.taoIn) : new BigN(0);
+  const alphaIn = subnetInfo.alphaIn ? new BigN(subnetInfo.alphaIn) : new BigN(0);
+  return netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
 };
 export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHandler {
   /* Unimplemented function  */
@@ -73,30 +80,40 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
   async getEarningSlippage(params) {
     const substrateApi = await this.substrateApi.isReady;
     const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(params.netuid)).toJSON();
-    const alphaIn = new BigNumber((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
-    const taoIn = new BigNumber((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.taoIn) || 0);
+    const alphaIn = new BigN((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
+    const taoIn = new BigN((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.taoIn) || 0);
     const k = alphaIn.multipliedBy(taoIn);
-    const value = new BigNumber(params.value);
+    const value = new BigN(params.value);
+    const rate = taoIn.dividedBy(alphaIn);
     if (params.type === ExtrinsicType.STAKING_BOND) {
       const newTaoIn = taoIn.plus(value);
       const newAlphaIn = k.dividedBy(newTaoIn);
       const alphaReturned = alphaIn.minus(newAlphaIn);
       const alphaIdeal = value.multipliedBy(alphaIn).dividedBy(taoIn);
       const slippage = alphaIdeal.minus(alphaReturned).dividedBy(alphaIdeal);
-      return slippage.toNumber();
+      return {
+        slippage: slippage.plus(0.0001).toNumber(),
+        rate: rate.toNumber()
+      };
     } else if (params.type === ExtrinsicType.STAKING_UNBOND) {
       const newAlphaIn = alphaIn.plus(value);
       const newTaoReserve = k.dividedBy(newAlphaIn);
       const taoReturned = taoIn.minus(newTaoReserve);
       const taoIdeal = value.multipliedBy(taoIn).dividedBy(alphaIn);
       const slippage = taoIdeal.minus(taoReturned).dividedBy(taoIdeal);
-      return slippage.toNumber();
+      return {
+        slippage: slippage.plus(0.0001).toNumber(),
+        rate: rate.toNumber()
+      };
     }
-    return 0;
+    return {
+      slippage: 0,
+      rate: 1
+    };
   }
   get maintainBalance() {
-    const ed = new BN(this.nativeToken.minAmount || '0');
-    const calculateMaintainBalance = new BN(15).mul(ed).div(BN_TEN);
+    const ed = new BigN(this.nativeToken.minAmount || '0');
+    const calculateMaintainBalance = new BigN(15).multipliedBy(ed).dividedBy(10);
     const maintainBalance = calculateMaintainBalance;
     return maintainBalance.toString();
   }
@@ -123,7 +140,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
             symbol,
             ownerHotkey: dynInfo.ownerHotkey,
             maxAllowedValidators: extraInfo ? extraInfo.maxAllowedValidators : 0,
-            taoIn: dynInfo.taoIn
+            taoIn: dynInfo.taoIn,
+            taoInEmission: dynInfo.taoInEmission
           };
         });
         this.subnetData = mergedData;
@@ -153,7 +171,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
           const netuid = subnet.netuid.toString().padStart(2, '0');
           const subnetSlug = `${this.slug}__subnet_${netuid.padStart(2, '0')}`;
           const subnetName = `${subnet.name || 'Unknown'} ${netuid}`;
-          const bnTaoIn = new BN(subnet.taoIn);
+          const bnTaoIn = new BigN(subnet.taoIn);
+          const emission = new BigN(subnet.taoInEmission).dividedBy(new BigN(10).pow(new BigN(7)));
           const data = {
             ...this.baseInfo,
             type: this.type,
@@ -182,7 +201,8 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
               eraTime: 24,
               era: 0,
               unstakingPeriod: 1.2,
-              tvl: bnTaoIn.toString()
+              tvl: bnTaoIn.toString(),
+              totalApy: emission.toNumber()
             }
           };
           callback(data);
@@ -350,7 +370,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
   // eslint-disable-next-line @typescript-eslint/require-await
   async getDevnetPoolTargets() {
     const testnetDelegate = (await this.substrateApi.api.call.delegateInfoRuntimeApi.getDelegates()).toJSON();
-    const bnMinBond = new BN(DEFAULT_DTAO_MINBOND);
+    const bnMinBond = new BigN(DEFAULT_DTAO_MINBOND);
     const filteredDelegates = testnetDelegate.filter(delegate => {
       return delegate.returnPer1000 !== 0;
     });
@@ -371,14 +391,14 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
   async getMainnetPoolTargets() {
     const _topValidator = await this.bittensorCache.get();
     const topValidator = _topValidator;
-    const bnMinBond = new BN(DEFAULT_DTAO_MINBOND);
+    const bnMinBond = new BigN(DEFAULT_DTAO_MINBOND);
     const validatorList = topValidator.data;
     const validatorAddresses = Object.keys(validatorList);
     const results = await Promise.all(validatorAddresses.map(i => {
       const address = validatorList[i].hotkey.ss58;
-      const bnTotalStake = new BN(validatorList[i].stake);
-      const bnOwnStake = new BN(validatorList[i].validator_stake);
-      const otherStake = bnTotalStake.sub(bnOwnStake);
+      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 roundedCommission = (parseFloat(commission) * 100).toFixed(0);
@@ -419,15 +439,18 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
   async createJoinExtrinsic(data, positionInfo, bondDest = 'Staked') {
     const {
       amount,
-      netuid,
-      selectedValidators: targetValidators
+      selectedValidators: targetValidators,
+      subnetData
     } = data;
+    const {
+      netuid,
+      slippage
+    } = subnetData;
     const chainApi = await this.substrateApi.isReady;
-    const binaryAmount = new BN(amount);
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const alphaToTaoPrice = new BigN(price[netuid]);
-    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 + DEFAULT_BITTENSOR_SLIPPAGE);
-    const BNlimitPrice = new BN(limitPrice.integerValue(BigNumber.ROUND_CEIL).toFixed());
+    const binaryAmount = new BigN(amount);
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 + (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
+    const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
     const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount, BNlimitPrice, false);
@@ -444,7 +467,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     const {
       amount
     } = data;
-    if (new BN(amount).lt(new BN(DEFAULT_DTAO_MINBOND))) {
+    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`))];
     }
     return baseErrors;
@@ -454,16 +477,15 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
 
   /* Leave pool action */
 
-  async handleYieldUnstake(amount, address, selectedTarget, netuid) {
+  async handleYieldUnstake(amount, address, selectedTarget, netuid, slippage) {
     const apiPromise = await this.substrateApi.isReady;
-    const binaryAmount = new BN(amount);
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const alphaToTaoPrice = new BigN(price[netuid]);
-    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 - DEFAULT_BITTENSOR_SLIPPAGE);
-    const BNlimitPrice = new BN(limitPrice.integerValue(BigNumber.ROUND_CEIL).toFixed());
     if (!selectedTarget) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
+    const binaryAmount = new BigN(amount);
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 - (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
+    const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount, BNlimitPrice, false);
     return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
@@ -477,10 +499,9 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
       return [new TransactionError(BasicTxErrorType.INVALID_PARAMS)];
     }
     const netuid = (_poolInfo$metadata$su = poolInfo.metadata.subnetData) === null || _poolInfo$metadata$su === void 0 ? void 0 : _poolInfo$metadata$su.netuid;
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const minUnstake = new BigN(DEFAULT_DTAO_MINBOND).dividedBy(new BigN(price[netuid]));
-    console.log('minUnstake', minUnstake.dividedBy(10 ** _getAssetDecimals(this.nativeToken)).toString());
-    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(BigNumber.ROUND_CEIL).dividedBy(1000);
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const minUnstake = new BigN(DEFAULT_DTAO_MINBOND).dividedBy(alphaToTaoPrice);
+    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(BigN.ROUND_CEIL).dividedBy(1000);
     if (new BigN(amount).lt(formattedMinUnstake.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)))) {
       var _poolInfo$metadata$su2;
       return [new TransactionError(BasicTxErrorType.INVALID_PARAMS, t(`Amount too low. You need to unstake at least ${formattedMinUnstake.toString()} ${((_poolInfo$metadata$su2 = poolInfo.metadata.subnetData) === null || _poolInfo$metadata$su2 === void 0 ? void 0 : _poolInfo$metadata$su2.subnetSymbol) || ''}`))];

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

@@ -61,7 +61,7 @@ export class BittensorCache {
   async fetchData() {
     const apiKey = bittensorApiKey();
     try {
-      const resp = await fetch('https://api.taostats.io/api/validator/latest/v1?limit=200', {
+      const resp = await fetch('https://api.taostats.io/api/validator/latest/v1?limit=50', {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
@@ -173,8 +173,17 @@ 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 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 bnTaoIn = new BN(taoIn);
         const BNminDelegatorStake = new BigN(minDelegatorStake.toString());
+        const apr = this.chain === 'bittensor' ? Number(highestApr.apr) * 100 : 0;
         const data = {
           ...this.baseInfo,
           type: this.type,
@@ -196,7 +205,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
             eraTime: 24,
             era: 0,
             unstakingPeriod: 1.2,
-            tvl: bnTaoIn.toString()
+            tvl: bnTaoIn.toString(),
+            totalApy: apr
           }
         };
         callback(data);