@subwallet/extension-base 1.1.29-beta.0 → 1.1.29-beta.1

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

@@ -21,6 +21,14 @@ var _base = _interopRequireDefault(require("../base"));
 
 class NominationPoolHandler extends _base.default {
   type = _types.YieldPoolType.NOMINATION_POOL;
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: false,
+    cancelUnstake: false,
+    withdraw: true,
+    claimReward: true
+  };
   constructor(state, chain) {
     super(state, chain);
     const _chainAsset = this.nativeToken;
@@ -83,7 +91,8 @@ class NominationPoolHandler extends _base.default {
       const inflation = (0, _utils.calculateInflation)(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
       const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
       const expectedReturn = (0, _utils.calculateChainStakedReturn)(inflation, bnTotalEraStake, bnTotalIssuance, chainInfo.slug);
-      const unlockingPeriod = parseInt(unlockingEras) * (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default); // in hours
+      const eraTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
+      const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
 
       const minToHuman = (0, _utils3.formatNumber)(minPoolJoin || '0', nativeToken.decimals || 0, _utils3.balanceFormatter);
       const data = {
@@ -106,6 +115,7 @@ class NominationPoolHandler extends _base.default {
           farmerCount: 0,
           // TODO recheck
           era: parseInt(currentEra),
+          eraTime,
           tvl: bnTotalEraStake.toString(),
           // TODO recheck
           totalApy: expectedReturn,
@@ -274,6 +284,9 @@ class NominationPoolHandler extends _base.default {
       cancel = false;
     };
   }
+  async getPoolRewardHistory(useAddresses, callBack) {
+    return new Promise(resolve => resolve(_util.noop));
+  }
 
   /* Get pool reward */
 

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

@@ -21,10 +21,6 @@ var _base = _interopRequireDefault(require("./base"));
 class BaseSpecialStakingPoolHandler extends _base.default {
   /** Pool's type */
 
-  /** Allow to create default unstake transaction */
-  allowDefaultUnstake = false;
-  /** Allow to create fast unstake transaction */
-  allowFastUnstake = true;
   get metadataInfo() {
     return {
       altInputAssets: this.altInputAsset,
@@ -36,9 +32,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       shortName: this.shortName,
       name: this.name,
       isAvailable: true,
-      allowCancelUnstaking: false,
       maintainAsset: this.nativeToken.slug,
-      maintainBalance: this.maintainBalance
+      maintainBalance: this.maintainBalance,
+      availableMethod: this.availableMethod
     };
   }
   get isPoolSupportAlternativeFee() {
@@ -99,6 +95,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
   async getPoolReward() {
     return new Promise(resolve => resolve(_util.noop));
   }
+  async getPoolRewardHistory() {
+    return new Promise(resolve => resolve(_util.noop));
+  }
 
   /* Get pool reward */
 
@@ -366,10 +365,10 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     if (!poolInfo || !poolInfo.statistic || !poolPosition) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
-    if (!this.allowDefaultUnstake && !fastLeave) {
+    if (!this.availableMethod.defaultUnstake && !fastLeave) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
-    if (!this.allowFastUnstake && fastLeave) {
+    if (!this.availableMethod.fastUnstake && fastLeave) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     const errors = [];

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

@@ -23,6 +23,7 @@ class EarningService {
     ready: false,
     data: {}
   });
+  earningRewardHistorySubject = new _rxjs.BehaviorSubject({});
   minAmountPercentSubject = new _rxjs.BehaviorSubject({});
   constructor(state) {
     this.state = state;
@@ -156,14 +157,11 @@ class EarningService {
 
   /* Get pools' reward */
 
-  updateEarningReward(stakingRewardData, callback) {
+  updateEarningReward(stakingRewardData) {
     const stakingRewardState = this.earningRewardSubject.getValue();
     stakingRewardState.ready = true;
-    const key = `${stakingRewardData.slug}___${stakingRewardData.address}`;
+    const key = `${stakingRewardData.slug}---${stakingRewardData.address}`;
     stakingRewardState.data[key] = stakingRewardData;
-    if (callback) {
-      callback(stakingRewardState);
-    }
     this.earningRewardSubject.next(stakingRewardState);
   }
   async getPoolReward(addresses, callback) {
@@ -198,6 +196,44 @@ class EarningService {
   getEarningRewards() {
     return this.earningRewardSubject.getValue();
   }
+  async fetchPoolRewardHistory(addresses, callback) {
+    let cancel = false;
+    await this.state.eventService.waitChainReady;
+    const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+    const activeChains = this.state.activeChainSlugs;
+    const unsubList = [];
+    for (const handler of Object.values(this.handlers)) {
+      if (activeChains.includes(handler.chain)) {
+        const chainInfo = handler.chainInfo;
+        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        handler.getPoolRewardHistory(useAddresses, callback).then(unsub => {
+          if (cancel) {
+            unsub();
+          } else {
+            unsubList.push(unsub);
+          }
+        }).catch(console.error);
+      }
+    }
+    return () => {
+      cancel = true;
+      unsubList.forEach(unsub => {
+        unsub === null || unsub === void 0 ? void 0 : unsub();
+      });
+    };
+  }
+  updateEarningRewardHistory(earningRewardHistory) {
+    const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
+    const key = `${earningRewardHistory.slug}---${earningRewardHistory.address}---${earningRewardHistory.blockTimestamp}`;
+    earningRewardHistoryState[key] = earningRewardHistory;
+    this.earningRewardHistorySubject.next(earningRewardHistoryState);
+  }
+  subscribeEarningRewardHistory() {
+    return this.earningRewardHistorySubject;
+  }
+  getEarningRewardHistory() {
+    return this.earningRewardHistorySubject.getValue();
+  }
 
   /* Get pools' reward */
 

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

@@ -252,5 +252,21 @@ class SubscanService {
     await _getTransferItems(0);
     return resultMap;
   }
+  getRewardHistoryList(chain, address) {
+    let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    return this.addRequest(async () => {
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/account/reward_slash'), {
+        page,
+        category: 'Reward',
+        row: 10,
+        address
+      });
+      if (rs.status !== 200) {
+        throw new _SWError.SWError('SubscanService.getRewardHistoryList', await rs.text());
+      }
+      const jsonData = await rs.json();
+      return jsonData.data;
+    });
+  }
 }
 exports.SubscanService = SubscanService;

package/constants/index.d.ts

@@ -1,3 +1,5 @@
+export declare const BASE_SECOND_INTERVAL = 1000;
+export declare const BASE_MINUTE_INTERVAL: number;
 export declare const CRON_REFRESH_PRICE_INTERVAL = 30000;
 export declare const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export declare const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
@@ -6,7 +8,7 @@ export declare const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
+export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
@@ -14,6 +16,7 @@ export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export declare const CRON_SYNC_MANTA_PAY = 300000;
 export declare const MANTA_PAY_BALANCE_INTERVAL = 30000;
+export declare const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL: number;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;

package/constants/index.js

@@ -1,6 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+export const BASE_SECOND_INTERVAL = 1000;
+export const BASE_MINUTE_INTERVAL = 60 * BASE_SECOND_INTERVAL;
 export const CRON_REFRESH_PRICE_INTERVAL = 30000;
 export const CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = 60000;
 export const CRON_AUTO_RECOVER_WEB3_INTERVAL = 90000;
@@ -9,7 +11,7 @@ export const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
+export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
@@ -17,6 +19,7 @@ export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export const CRON_SYNC_MANTA_PAY = 300000;
 export const MANTA_PAY_BALANCE_INTERVAL = 30000;
+export const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = 15 * BASE_MINUTE_INTERVAL;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;

package/koni/background/cron.d.ts

@@ -28,6 +28,7 @@ export declare class KoniCron {
     resetNft: (newAddress: string) => void;
     refreshStakingReward: (address: string) => () => void;
     refreshStakingRewardFastInterval: (address: string) => () => void;
+    refreshEarningRewardHistoryInterval: (address: string) => () => void;
     setStakingRewardReady: () => void;
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
     reloadNft(): Promise<boolean>;

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -88,13 +88,15 @@ export class KoniCron {
       // NFT
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
+      commonReload && this.removeCron('refreshPoolingStakingReward');
 
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) {
-        // only add cron job if there's at least 1 active network
+        // only add cron jobs if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
-        commonReload && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+        (commonReload || chainUpdated) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+        (commonReload || chainUpdated) && this.addCron('refreshEarningRewardHistoryInterval', this.refreshEarningRewardHistoryInterval(currentAccountInfo.address), CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
       } else {
         this.setStakingRewardReady();
       }
@@ -108,6 +110,7 @@ export class KoniCron {
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
       // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      this.addCron('refreshEarningRewardHistoryInterval', this.refreshEarningRewardHistoryInterval(currentAccountInfo.address), CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();
@@ -155,6 +158,11 @@ export class KoniCron {
       this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
     };
   };
+  refreshEarningRewardHistoryInterval = address => {
+    return () => {
+      this.subscriptions.subscribeEarningRewardHistoryInterval(address).catch(this.logger.error);
+    };
+  };
   setStakingRewardReady = () => {
     this.state.updateStakingRewardReady(true);
   };

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

@@ -222,6 +222,7 @@ export default class KoniExtension {
     private getYieldPoolTargets;
     private subscribeYieldPosition;
     private subscribeYieldReward;
+    private subscribeYieldRewardHistory;
     private subscribeEarningMinAmountPercent;
     private handleValidateYieldProcess;
     private yieldSubmitWithdrawal;

package/koni/background/handlers/Extension.js

@@ -3660,6 +3660,19 @@ export default class KoniExtension {
     });
     return this.#koniState.earningService.getEarningRewards();
   }
+  subscribeYieldRewardHistory(id, port) {
+    const cb = createSubscription(id, port);
+    const rewardHistorySubscription = this.#koniState.earningService.subscribeEarningRewardHistory().subscribe({
+      next: rs => {
+        cb(rs);
+      }
+    });
+    this.createUnsubscriptionHandle(id, rewardHistorySubscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.earningService.getEarningRewardHistory();
+  }
   subscribeEarningMinAmountPercent(id, port) {
     const cb = createSubscription(id, port);
     const earningMinAmountPercentSubscription = this.#koniState.earningService.subscribeMinAmountPercent().subscribe({
@@ -4001,6 +4014,8 @@ export default class KoniExtension {
         return this.subscribeYieldPosition(id, port);
       case 'pri(yield.subscribeYieldReward)':
         return this.subscribeYieldReward(id, port);
+      case 'pri(yield.subscribeRewardHistory)':
+        return this.subscribeYieldRewardHistory(id, port);
       case 'pri(yield.minAmountPercent)':
         return this.subscribeEarningMinAmountPercent(id, port);
 

package/koni/background/subscription.d.ts

@@ -31,6 +31,7 @@ export declare class KoniSubscription {
     initNftSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;
     subscribeStakingReward(address: string): Promise<void>;
     subscribeStakingRewardFastInterval(address: string): Promise<void>;
+    subscribeEarningRewardHistoryInterval(address: string): Promise<void>;
     reloadStaking(): Promise<void>;
     reloadBalance(): Promise<void>;
     reloadCrowdloan(): Promise<void>;

package/koni/background/subscription.js

@@ -139,7 +139,7 @@ export class KoniSubscription {
   }
   initYieldPoolStatsSubscription(substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
     let cancel = false;
-    this.state.resetYieldPoolInfo(Object.keys(this.state.getActiveChainInfoMap()));
+    this.state.resetYieldPoolInfo(Object.keys(this.state.getChainInfoMap()));
     const updateYieldPoolStats = data => {
       this.state.updateYieldPoolInfo(data);
     };
@@ -289,32 +289,21 @@ export class KoniSubscription {
     if (!addresses.length) {
       return;
     }
-    const pooledStakingItems = await this.state.getPooledPositionByAddress(addresses);
-    const pooledAddresses = [];
-    pooledStakingItems.forEach(pooledItem => {
-      if (!pooledAddresses.includes(pooledItem.address)) {
-        pooledAddresses.push(pooledItem.address);
-      }
-    });
-    const chainInfoMap = this.state.getChainInfoMap();
-    const targetChainMap = {};
-    Object.entries(chainInfoMap).forEach(([key, network]) => {
-      const chainState = this.state.getChainStateByKey(key);
-      if (_isChainEnabled(chainState) && _isChainSupportSubstrateStaking(network)) {
-        targetChainMap[key] = network;
-      }
-    });
-    const activeNetworks = [];
-    Object.keys(targetChainMap).forEach(key => {
-      activeNetworks.push(key);
-    });
     const updateState = result => {
       this.state.earningService.updateEarningReward(result);
     };
-    await Promise.all([this.state.earningService.getPoolReward(addresses, updateState) // TODO
-    ]);
+    await Promise.all([this.state.earningService.getPoolReward(addresses, updateState)]);
+  }
+  async subscribeEarningRewardHistoryInterval(address) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    const updateState = result => {
+      this.state.earningService.updateEarningRewardHistory(result);
+    };
+    await Promise.all([this.state.earningService.fetchPoolRewardHistory(addresses, updateState)]);
   }
-
   async reloadStaking() {
     // const currentAddress = this.state.keyringService.currentAccount?.address;
 

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.29-beta.0",
+  "version": "1.1.29-beta.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",

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, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BasePoolInfo, BaseYieldPoolMetadata, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 /**
  * @class BasePoolHandler
  * @description Base pool handler
@@ -25,6 +25,8 @@ export default abstract class BasePoolHandler {
     protected abstract shortName: string;
     /** Pool's transaction type */
     readonly transactionChainType: ChainType;
+    /** Pool's available method */
+    protected abstract readonly availableMethod: YieldPoolMethodInfo;
     /**
      * @constructor
      * @param {KoniState} state - Koni state
@@ -52,6 +54,8 @@ export default abstract class BasePoolHandler {
     abstract subscribePoolPosition(useAddresses: string[], callback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     /** Get pool reward */
     abstract getPoolReward(useAddresses: string[], callback: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
+    /** Get pool reward history */
+    abstract getPoolRewardHistory(useAddresses: string[], callback: (rs: EarningRewardHistoryItem) => void): Promise<VoidFunction>;
     /** Get pool target */
     abstract getPoolTargets(): Promise<YieldPoolTarget[]>;
     earlyValidate(request: RequestEarlyValidateYield): Promise<ResponseEarlyValidateYield>;

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

@@ -27,6 +27,8 @@ export default class BasePoolHandler {
   /** Pool's transaction type */
   transactionChainType = ChainType.SUBSTRATE;
 
+  /** Pool's available method */
+
   /**
    * @constructor
    * @param {KoniState} state - Koni state
@@ -70,7 +72,7 @@ export default class BasePoolHandler {
     const decimals = this.nativeToken.decimals || 0;
     const defaultMaintainBalance = new BN(1).mul(BN_TEN.pow(new BN(decimals)));
     const ed = new BN(this.nativeToken.minAmount || '0');
-    const maintainBalance = ed.gt(defaultMaintainBalance) ? ed.mul(new BN(1.5)) : defaultMaintainBalance;
+    const maintainBalance = ed.gte(defaultMaintainBalance) ? ed.mul(new BN(1.5)) : defaultMaintainBalance;
     return maintainBalance.toString();
   }
   get metadataInfo() {
@@ -80,9 +82,9 @@ export default class BasePoolHandler {
       logo: this.logo,
       inputAsset: this.nativeToken.slug,
       isAvailable: true,
-      allowCancelUnstaking: false,
       maintainAsset: this.nativeToken.slug,
-      maintainBalance: this.maintainBalance
+      maintainBalance: this.maintainBalance,
+      availableMethod: this.availableMethod
     };
   }
 

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

@@ -1,8 +1,9 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { BaseYieldStepDetail, HandleYieldStepData, LendingYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldStepDetail, HandleYieldStepData, LendingYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import BaseLendingPoolHandler from './base';
 export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
+    slug: string;
     protected readonly name: string;
     protected readonly shortName: string;
     protected readonly altInputAsset: string;
@@ -10,7 +11,7 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    slug: string;
+    protected readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;
     getPoolStat(): Promise<LendingYieldPoolInfo>;

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

@@ -14,6 +14,14 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
   inputAsset = 'interlay-LOCAL-DOT';
   rewardAssets = ['interlay-LOCAL-DOT'];
   feeAssets = ['interlay-NATIVE-INTR', 'interlay-LOCAL-DOT'];
+  availableMethod = {
+    join: true,
+    defaultUnstake: false,
+    fastUnstake: true,
+    cancelUnstake: false,
+    withdraw: false,
+    claimReward: false
+  };
   constructor(state, chain) {
     super(state, chain);
     const chainInfo = this.chainInfo;

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

@@ -1,6 +1,6 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { BaseYieldStepDetail, HandleYieldStepData, LiquidYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldStepDetail, HandleYieldStepData, LiquidYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import BaseLiquidStakingPoolHandler from './base';
 export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
     protected readonly name: string;
@@ -10,10 +10,8 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    /** @inner */
     readonly minAmountPercent = 0.98;
-    /** @inner */
-    protected readonly allowDefaultUnstake = true;
+    protected readonly availableMethod: YieldPoolMethodInfo;
     slug: string;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;
@@ -24,4 +22,5 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     handleSubmitStep(data: SubmitYieldJoinData, path: OptimalYieldPath): Promise<HandleYieldStepData>;
     handleYieldRedeem(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
     handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
 }

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

@@ -16,10 +16,15 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
   inputAsset = 'acala-LOCAL-DOT';
   rewardAssets = ['acala-LOCAL-DOT'];
   feeAssets = ['acala-NATIVE-ACA', 'acala-LOCAL-DOT'];
-  /** @inner */
   minAmountPercent = 0.98;
-  /** @inner */
-  allowDefaultUnstake = true;
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: true,
+    cancelUnstake: false,
+    withdraw: true,
+    claimReward: false
+  };
   constructor(state, chain) {
     super(state, chain);
     const chainInfo = this.chainInfo;
@@ -33,6 +38,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
 
   /* Subscribe pool info */
 
+  // Todo: Update with cache statistic data => Fetching periodically assetEarning, apy, exchangeRate, tvl, totalApy
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
     const stakingMetaPromise = new Promise(function (resolve) {
@@ -116,6 +122,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
           derivativeToken: derivativeTokenSlug,
           isBondedBefore: bnTotalBalance.gt(BN_ZERO),
           nominations: [],
+          // TODO: add unstaking info from homa.redeemRequests
           unstakings: []
         };
         resultCallback(result);
@@ -186,12 +193,16 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     weightedMinAmount // should always set a min target to prevent unexpected result
     );
 
-    return [ExtrinsicType.REDEEM_QDOT, extrinsic];
+    return [ExtrinsicType.REDEEM_LDOT, extrinsic];
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
     const chainApi = await this.substrateApi.isReady;
     const extrinsic = chainApi.api.tx.homa.requestRedeem(amount, false);
-    return [ExtrinsicType.UNSTAKE_QDOT, extrinsic];
+    return [ExtrinsicType.UNSTAKE_LDOT, extrinsic];
+  }
+  async handleYieldWithdraw(address, unstakingInfo) {
+    const chainApi = await this.substrateApi.isReady;
+    return chainApi.api.tx.homa.claimRedemption(address);
   }
 
   /* Leave pool action */

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

@@ -1,6 +1,6 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { BaseYieldStepDetail, HandleYieldStepData, LiquidYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldStepDetail, HandleYieldStepData, LiquidYieldPoolInfo, OptimalYieldPath, OptimalYieldPathParams, SubmitYieldJoinData, TransactionData, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import BaseLiquidStakingPoolHandler from './base';
 export interface BifrostLiquidStakingMeta {
     apy: string;
@@ -23,6 +23,7 @@ export interface BifrostVtokenExchangeRate {
     token_pool: number;
 }
 export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
+    slug: string;
     protected readonly name: string;
     protected readonly shortName: string;
     protected readonly altInputAsset: string;
@@ -30,9 +31,8 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    /** @inner */
     readonly minAmountPercent = 0.99;
-    slug: string;
+    protected readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);
     protected getDescription(): string;
     getPoolStat(): Promise<LiquidYieldPoolInfo>;
@@ -41,4 +41,5 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     getSubmitStepFee(params: OptimalYieldPathParams): Promise<YieldTokenBaseInfo>;
     handleSubmitStep(data: SubmitYieldJoinData, path: OptimalYieldPath): Promise<HandleYieldStepData>;
     handleYieldRedeem(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
+    handleYieldUnstake(amount: string, address: string, selectedTarget?: string): Promise<[ExtrinsicType, TransactionData]>;
 }

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

@@ -19,8 +19,15 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
   inputAsset = 'bifrost_dot-LOCAL-DOT';
   rewardAssets = ['bifrost_dot-LOCAL-DOT'];
   feeAssets = ['bifrost_dot-NATIVE-BNC', 'bifrost_dot-LOCAL-DOT'];
-  /** @inner */
   minAmountPercent = 0.99;
+  availableMethod = {
+    join: true,
+    defaultUnstake: true,
+    fastUnstake: true,
+    cancelUnstake: false,
+    withdraw: false,
+    claimReward: false
+  };
   constructor(state, chain) {
     super(state, chain);
     const chainInfo = this.chainInfo;
@@ -133,6 +140,8 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
       }
 
       const unlockingMap = {};
+
+      // TODO: review unstaking info vtokenMinting.userUnlockLedger
       const _unlockInfoList = await substrateApi.api.query.vtokenMinting.tokenUnlockLedger.multi(unlockLedgerList.map(({
         ledgerId
       }) => [_getTokenOnChainInfo(inputTokenInfo), ledgerId]));
@@ -251,6 +260,13 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     const extrinsic = substrateApi.api.tx.stablePool.swap(0, 1, 0, amount, weightedMinAmount);
     return [ExtrinsicType.REDEEM_VDOT, extrinsic];
   }
+  async handleYieldUnstake(amount, address, selectedTarget) {
+    const chainApi = await this.substrateApi.isReady;
+    const inputTokenSlug = this.inputAsset;
+    const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
+    const extrinsic = chainApi.api.tx.vtokenMinting.redeem(_getTokenOnChainInfo(inputTokenInfo), amount);
+    return [ExtrinsicType.UNSTAKE_VDOT, extrinsic];
+  }
 
   /* Leave pool action */
 }