@subwallet/extension-base 1.3.29-0 → 1.3.30-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.29-0",
+  "version": "1.3.30-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1886,11 +1886,6 @@
       "require": "./cjs/services/swap-service/handler/uniswap-handler.js",
       "default": "./services/swap-service/handler/uniswap-handler.js"
     },
-    "./services/swap-service/interface": {
-      "types": "./services/swap-service/interface.d.ts",
-      "require": "./cjs/services/swap-service/interface.js",
-      "default": "./services/swap-service/interface.js"
-    },
     "./services/swap-service/utils": {
       "types": "./services/swap-service/utils.d.ts",
       "require": "./cjs/services/swap-service/utils.js",
@@ -2642,7 +2637,6 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^5.1.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
@@ -2670,12 +2664,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.102",
-    "@subwallet/extension-base": "^1.3.29-0",
-    "@subwallet/extension-chains": "^1.3.29-0",
-    "@subwallet/extension-dapp": "^1.3.29-0",
-    "@subwallet/extension-inject": "^1.3.29-0",
+    "@subwallet/extension-base": "^1.3.30-0",
+    "@subwallet/extension-chains": "^1.3.30-0",
+    "@subwallet/extension-dapp": "^1.3.30-0",
+    "@subwallet/extension-inject": "^1.3.30-0",
     "@subwallet/keyring": "^0.1.9",
-    "@subwallet/subwallet-api-sdk": "^1.3.29-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.30-0",
     "@subwallet/ui-keyring": "^0.1.9",
     "@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.29-0'
+  version: '1.3.30-0'
 };

package/services/balance-service/transfer/xcm/availBridge.js

@@ -55,12 +55,12 @@ export async function getClaimTxOnAvail(notification, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const chainSlug = chainApi.chainSlug;
   const metadata = notification.metadata;
-  const lastestEthHeadSlot = await getLastestEthHeadSlot(chainSlug);
-  const lastestBlockHash = await getLastestBlockHash(chainSlug, lastestEthHeadSlot);
-  const proof = await getClaimProofOnAvail(chainSlug, lastestBlockHash, metadata.messageId);
-  return chainApi.api.tx.vector.execute(lastestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
+  const latestEthHeadSlot = await getLatestEthHeadSlot(chainSlug);
+  const latestBlockHash = await getLatestBlockHash(chainSlug, latestEthHeadSlot);
+  const proof = await getClaimProofOnAvail(chainSlug, latestBlockHash, metadata.messageId);
+  return chainApi.api.tx.vector.execute(latestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
 }
-async function getLastestEthHeadSlot(chainSlug) {
+async function getLatestEthHeadSlot(chainSlug) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/eth/head`);
@@ -71,7 +71,7 @@ async function getLastestEthHeadSlot(chainSlug) {
     throw e;
   }
 }
-async function getLastestBlockHash(chainSlug, slot) {
+async function getLatestBlockHash(chainSlug, slot) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/beacon/slot/${slot}`);

package/services/base/types.d.ts

@@ -1,4 +1,3 @@
-import { OptimalProcessParams, OptimalProcessResult } from '@subwallet/extension-base/types/service-base';
 import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
 export declare enum ServiceStatus {
     NOT_INITIALIZED = "not_initialized",
@@ -33,6 +32,3 @@ export interface CronServiceInterface {
     startCron: () => Promise<void>;
     stopCron: () => Promise<void>;
 }
-export interface ServiceWithProcessInterface {
-    generateOptimalProcess(params: OptimalProcessParams): Promise<OptimalProcessResult>;
-}

package/services/chain-service/constants.js

@@ -278,7 +278,7 @@ export const _XCM_CHAIN_GROUP = {
   // default is xTokens pallet
 };
 
-export const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub', 'hydradx_main'];
+export const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub'];
 export const _XCM_TYPE = {
   RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
   // DMP

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

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

@@ -6,6 +6,7 @@ import { PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface }
 import { EarningRewardHistoryItem, EarningRewardItem, EarningRewardJson, HandleYieldStepData, HandleYieldStepParams, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldLeave, RequestYieldWithdrawal, ResponseEarlyValidateYield, TransactionData, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolTarget, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
+import { EarningSlippageResult } from './handlers/native-staking/dtao';
 import { BasePoolHandler } from './handlers';
 export default class EarningService implements StoppableServiceInterface, PersistDataServiceInterface {
     protected readonly state: KoniState;
@@ -98,6 +99,6 @@ export default class EarningService implements StoppableServiceInterface, Persis
     handleYieldWithdraw(params: RequestYieldWithdrawal): Promise<TransactionData>;
     handleYieldCancelUnstake(params: RequestStakeCancelWithdrawal): Promise<TransactionData>;
     handleYieldClaimReward(params: RequestStakeClaimReward): Promise<TransactionData>;
-    yieldGetEarningSlippage(params: RequestEarningSlippage): Promise<number>;
+    yieldGetEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
     resetWallet(): Promise<void>;
 }

package/services/earning-service/service.js

@@ -755,8 +755,9 @@ export default class EarningService {
     } = params;
     const handler = this.getPoolHandler(slug);
     const netuid = (_params$poolInfo$meta = params.poolInfo.metadata.subnetData) === null || _params$poolInfo$meta === void 0 ? void 0 : _params$poolInfo$meta.netuid;
+    const slippage = params.slippage;
     if (handler) {
-      return handler.handleYieldLeave(params.fastLeave, params.amount, params.address, params.selectedTarget, netuid);
+      return handler.handleYieldLeave(params.fastLeave, params.amount, params.address, params.selectedTarget, netuid, slippage);
     } else {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }

package/services/fee-service/utils/index.d.ts

@@ -11,4 +11,5 @@ export declare const fetchOnlineFeeData: (chainId: number, networkKey: string, u
 export declare const recalculateGasPrice: (_price: string, chain: string) => string;
 export declare const getEIP1559GasFee: (baseFee: BigN, maxPriorityFee: BigN, blockNumber: number, blockTime: number) => EvmEIP1559FeeOption;
 export declare const calculateGasFeeParams: (web3: _EvmApi, networkKey: string, useOnline?: boolean, useInfura?: boolean) => Promise<EvmFeeInfo>;
+export declare const enforceMinOneTip: (feeOptionDetail: EvmEIP1559FeeOption) => EvmEIP1559FeeOption;
 export declare const calculateToAmountByReservePool: (api: ApiPromise, fromToken: _ChainAsset, toToken: _ChainAsset, fromAmount: string) => Promise<string>;

package/services/fee-service/utils/index.js

@@ -10,7 +10,7 @@ const INFURA_API_KEY = process.env.INFURA_API_KEY || '';
 const INFURA_API_KEY_SECRET = process.env.INFURA_API_KEY_SECRET || '';
 const INFURA_AUTH = 'Basic ' + Buffer.from(INFURA_API_KEY + ':' + INFURA_API_KEY_SECRET).toString('base64');
 export const FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = 105; // percentage
-
+const EIP1559_MIN_PRIORITY_FEE = '1';
 export const parseInfuraFee = (info, threshold) => {
   const base = new BigN(info.estimatedBaseFee).multipliedBy(BN_WEI);
   const thresholdBN = new BigN(threshold.busyThreshold).multipliedBy(BN_WEI);
@@ -161,15 +161,18 @@ export const calculateGasFeeParams = async (web3, networkKey, useOnline = true,
     const slowPriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[0]), BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
     const averagePriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[1]), BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
     const fastPriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[2]), BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
+    if (slowPriorityFee.eq(0) && averagePriorityFee.eq(0) && fastPriorityFee.eq(0)) {
+      throw new Error('Fee rates are currently same for all levels');
+    }
     return {
       type: 'evm',
       gasPrice: undefined,
       baseGasFee: baseGasFee.toString(),
       busyNetwork,
       options: {
-        slow: getEIP1559GasFee(baseGasFee, slowPriorityFee, 10, blockTime),
-        average: getEIP1559GasFee(baseGasFee, averagePriorityFee, 5, blockTime),
-        fast: getEIP1559GasFee(baseGasFee, fastPriorityFee, 3, blockTime),
+        slow: enforceMinOneTip(getEIP1559GasFee(baseGasFee, slowPriorityFee, 10, blockTime)),
+        average: enforceMinOneTip(getEIP1559GasFee(baseGasFee, averagePriorityFee, 5, blockTime)),
+        fast: enforceMinOneTip(getEIP1559GasFee(baseGasFee, fastPriorityFee, 3, blockTime)),
         default: busyNetwork ? 'average' : 'slow'
       }
     };
@@ -185,6 +188,13 @@ export const calculateGasFeeParams = async (web3, networkKey, useOnline = true,
     };
   }
 };
+export const enforceMinOneTip = feeOptionDetail => {
+  if (feeOptionDetail.maxPriorityFeePerGas === '0') {
+    feeOptionDetail.maxPriorityFeePerGas = EIP1559_MIN_PRIORITY_FEE;
+    return feeOptionDetail;
+  }
+  return feeOptionDetail;
+};
 export const calculateToAmountByReservePool = async (api, fromToken, toToken, fromAmount) => {
   const reserve = await getReserveForPool(api, fromToken, toToken);
   return estimateTokensForPool(fromAmount, reserve);