@subwallet/extension-base 1.1.40-1 → 1.1.42-0

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

@@ -2,7 +2,7 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { AssetSetting, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
-import { _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { IMetadataItem } from '@subwallet/extension-base/services/storage-service/databases';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
@@ -19,6 +19,7 @@ export declare class ChainService {
     get mantaPay(): MantaPrivateHandler | undefined;
     private chainInfoMapSubject;
     private chainStateMapSubject;
+    private chainStatusMapSubject;
     private assetRegistrySubject;
     private multiChainAssetMapSubject;
     private xcmRefMapSubject;
@@ -26,7 +27,7 @@ export declare class ChainService {
     private assetSettingSubject;
     private logger;
     constructor(dbService: DatabaseService, eventService: EventService);
-    getXcmRefMap(): Record<string, _AssetRef>;
+    get xcmRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
     getSubstrateApiMap(): Record<string, import("./handler/SubstrateApi").SubstrateApi>;
@@ -40,6 +41,7 @@ export declare class ChainService {
     subscribeMultiChainAssetMap(): Subject<Record<string, _MultiChainAsset>>;
     subscribeXcmRefMap(): Subject<Record<string, _AssetRef>>;
     subscribeChainStateMap(): Subject<Record<string, _ChainState>>;
+    subscribeChainStatusMap(): BehaviorSubject<Record<string, _ChainApiStatus>>;
     getAssetRegistry(): Record<string, _ChainAsset>;
     getMultiChainAssetMap(): Record<string, _MultiChainAsset>;
     getSmartContractTokens(): Record<string, _ChainAsset>;
@@ -51,6 +53,8 @@ export declare class ChainService {
     getAssetRefMap(): Record<string, _AssetRef>;
     getChainStateMap(): Record<string, _ChainState>;
     getChainStateByKey(key: string): _ChainState;
+    getChainStatusMap(): Record<string, _ChainApiStatus>;
+    getChainStatusByKey(key: string): _ChainApiStatus;
     getActiveChains(): string[];
     getSupportedSmartContractTypes(): _AssetType[];
     getActiveChainInfoMap(): Record<string, _ChainInfo>;
@@ -66,7 +70,8 @@ export declare class ChainService {
     forceRemoveChain(slug: string): boolean;
     removeCustomChain(slug: string): boolean;
     resetChainInfoMap(excludedChains?: string[]): boolean;
-    setChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
+    private connectionStatusQueueMap;
+    updateChainConnectionStatus(slug: string, connectionStatus: _ChainConnectionStatus): void;
     upsertCustomToken(token: _ChainAsset): string;
     deleteAssetsByChain(chainSlug: string): void;
     deleteCustomAssets(targetAssets: string[]): void;
@@ -109,7 +114,6 @@ export declare class ChainService {
     refreshEvmApi(slug: string): void;
     stopAllChainApis(): Promise<void>;
     resumeAllChainApis(): Promise<void>;
-    checkAndUpdateStatusMapForChain(chainSlug: string): void;
     initAssetSettings(): Promise<void>;
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     setMantaZkAssetSettings(visible: boolean): void;

package/services/chain-service/index.js

@@ -31,6 +31,7 @@ export class ChainService {
   // TODO: consider BehaviorSubject
   chainInfoMapSubject = new Subject();
   chainStateMapSubject = new Subject();
+  chainStatusMapSubject = new BehaviorSubject({});
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
@@ -44,7 +45,7 @@ export class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     if (MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new MantaPrivateHandler(dbService);
@@ -55,19 +56,15 @@ export class ChainService {
   }
 
   // Getter
-  getXcmRefMap() {
-    return this.dataMap.assetRefMap;
-    // const result: Record<string, _AssetRef> = {};
-    //
-    // Object.entries(AssetRefMap).forEach(([key, assetRef]) => {
-    //   if (assetRef.path === _AssetRefPath.XCM) {
-    //     result[key] = assetRef;
-    //   }
-    // });
-    //
-    // return result;
+  get xcmRefMap() {
+    const result = {};
+    Object.entries(AssetRefMap).forEach(([key, assetRef]) => {
+      if (assetRef.path === _AssetRefPath.XCM) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
   }
-
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -104,6 +101,9 @@ export class ChainService {
   subscribeChainStateMap() {
     return this.chainStateMapSubject;
   }
+  subscribeChainStatusMap() {
+    return this.chainStatusMapSubject;
+  }
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
@@ -181,6 +181,12 @@ export class ChainService {
   getChainStateByKey(key) {
     return this.dataMap.chainStateMap[key];
   }
+  getChainStatusMap() {
+    return this.chainStatusMapSubject.getValue();
+  }
+  getChainStatusByKey(key) {
+    return this.getChainStatusMap()[key];
+  }
   getActiveChains() {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
@@ -250,7 +256,7 @@ export class ChainService {
       if (asset.originChain === destinationChainSlug) {
         // check
         const assetRefKey = _parseAssetRefKey(originTokenSlug, asset.slug);
-        const assetRef = this.getAssetRefMap()[assetRefKey];
+        const assetRef = this.xcmRefMap[assetRefKey];
         if (assetRef && assetRef.path === _AssetRefPath.XCM) {
           // there's only 1 corresponding token on 1 chain
           destinationTokenInfo = asset;
@@ -339,9 +345,31 @@ export class ChainService {
     this.lockChainInfoMap = false;
     return true;
   }
-  setChainConnectionStatus(slug, connectionStatus) {
-    const chainStateMap = this.getChainStateMap();
-    chainStateMap[slug].connectionStatus = connectionStatus;
+  connectionStatusQueueMap = {};
+  updateChainConnectionStatus(slug, connectionStatus) {
+    this.connectionStatusQueueMap[slug] = connectionStatus;
+    addLazy('updateChainConnectionStatus', () => {
+      const chainStatusMap = this.getChainStatusMap();
+      let update = false;
+      Object.entries(this.connectionStatusQueueMap).forEach(([slug, status]) => {
+        if (chainStatusMap[slug]) {
+          if (chainStatusMap[slug].connectionStatus !== status) {
+            chainStatusMap[slug].connectionStatus = status;
+            chainStatusMap[slug].lastUpdated = Date.now();
+            update = true;
+          }
+        } else {
+          chainStatusMap[slug] = {
+            slug,
+            connectionStatus: status,
+            lastUpdated: Date.now()
+          };
+          update = true;
+        }
+      });
+      this.connectionStatusQueueMap = {};
+      update && this.chainStatusMapSubject.next(chainStatusMap);
+    });
   }
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
@@ -404,7 +432,7 @@ export class ChainService {
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.assetRegistrySubject.next(this.getAssetRegistry());
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
     await this.initAssetRefMap();
@@ -466,17 +494,21 @@ export class ChainService {
     this.dataMap.assetRefMap = updatedAssetRefMap;
 
     // this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.xcmRefMapSubject.next(this.xcmRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
+    let isUpdated = false;
     Object.entries(latestPriceIds).forEach(([slug, priceId]) => {
-      if (this.dataMap.assetRegistry[slug]) {
+      if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
+        isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
       }
     });
-    this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.eventService.emit('asset.updateState', '');
+    if (isUpdated) {
+      this.assetRegistrySubject.next(this.dataMap.assetRegistry);
+      this.eventService.emit('asset.updateState', '');
+    }
     this.logger.log('Finished updating latest price IDs');
   }
   handleLatestData() {
@@ -486,12 +518,10 @@ export class ChainService {
     this.fetchLatestBlockedAssetRef().then(latestAssetRef => {
       this.handleLatestBlockedAssetRef(latestAssetRef);
     }).catch(console.error);
-
-    // this.fetchLatestPriceIdsData().then((latestPriceIds) => {
-    //   this.handleLatestPriceId(latestPriceIds);
-    // }).catch(console.error);
+    this.fetchLatestPriceIdsData().then(latestPriceIds => {
+      this.handleLatestPriceId(latestPriceIds);
+    }).catch(console.error);
   }
-
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
@@ -513,13 +543,8 @@ export class ChainService {
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
     const onUpdateStatus = status => {
-      const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
-
-      // Avoid unnecessary update in case disable chain
-      if (currentStatus !== status) {
-        this.setChainConnectionStatus(chainInfo.slug, status);
-        this.updateChainStateMapSubscription();
-      }
+      const slug = chainInfo.slug;
+      this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
       if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
@@ -618,7 +643,7 @@ export class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
     // Set disconnect state for inactive chain
-    chainStateMap[chainSlug].connectionStatus = _ChainConnectionStatus.DISCONNECTED;
+    this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
@@ -711,9 +736,9 @@ export class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          connectionStatus: _ChainConnectionStatus.DISCONNECTED,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
         };
+        this.updateChainConnectionStatus(chainInfo.slug, _ChainConnectionStatus.DISCONNECTED);
 
         // create data for storage
         newStorageData.push({
@@ -764,9 +789,9 @@ export class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
           };
+          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
@@ -786,9 +811,9 @@ export class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
+            this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
@@ -813,9 +838,9 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
+            this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
@@ -833,9 +858,9 @@ export class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug)
           };
+          this.updateChainConnectionStatus(slug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
@@ -910,9 +935,7 @@ export class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    addLazy('updateChainStateMapSubscription', () => {
-      this.chainStateMapSubject.next(this.getChainStateMap());
-    }, 300, 900);
+    this.chainStateMapSubject.next(this.getChainStateMap());
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
@@ -1021,10 +1044,17 @@ export class ChainService {
     const chainStateMap = this.getChainStateMap();
     chainStateMap[newChainSlug] = {
       active: true,
-      connectionStatus: _ChainConnectionStatus.DISCONNECTED,
       currentProvider: params.chainEditInfo.currentProvider,
       slug: newChainSlug
     };
+
+    // const chainStatusMap = this.getChainStatusMap();
+    // const chainStatusMap[newChainSlug] = {
+    //   slug: newChainSlug,
+    //   connectionStatus: _ChainConnectionStatus.DISCONNECTED,
+    //   lastUpdated: Date.now()
+    // };
+
     await this.initApiForChain(chainInfo);
 
     // create a record in assetRegistry for native token and update store/subscription
@@ -1309,29 +1339,6 @@ export class ChainService {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
     this.checkLatestData();
   }
-  checkAndUpdateStatusMapForChain(chainSlug) {
-    const substrateApiMap = this.getSubstrateApiMap();
-    const evmApiMap = this.getEvmApiMap();
-    const chainState = this.getChainStateByKey(chainSlug);
-    let update = false;
-    function updateState(current, status) {
-      if (current.connectionStatus !== status) {
-        current.connectionStatus = status;
-        update = true;
-      }
-    }
-    if (chainState.active) {
-      const api = substrateApiMap[chainSlug] || evmApiMap[chainSlug];
-      if (api) {
-        updateState(chainState, api.isApiConnected ? _ChainConnectionStatus.CONNECTED : _ChainConnectionStatus.DISCONNECTED);
-      }
-    } else {
-      updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
-    }
-    if (update) {
-      this.dataMap.chainStateMap[chainSlug] = chainState;
-    }
-  }
   async initAssetSettings() {
     const assetSettings = await this.getAssetSettings();
     const activeChainSlugs = this.getActiveChainSlugs();

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

@@ -22,7 +22,11 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
+}
+export interface _ChainApiStatus {
+    slug: string;
     connectionStatus: _ChainConnectionStatus;
+    lastUpdated: number;
 }
 export interface _SubstrateDefaultFormatBalance {
     decimals?: number[] | number;

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

@@ -15,6 +15,7 @@ export declare function _isTokenTransferredByEvm(tokenInfo: _ChainAsset): boolea
 export declare function _checkSmartContractSupportByChain(chainInfo: _ChainInfo, contractType: _AssetType): boolean;
 export declare function _getTokenOnChainAssetId(tokenInfo: _ChainAsset): string;
 export declare function _getTokenOnChainInfo(tokenInfo: _ChainAsset): Record<string, any>;
+export declare function _isBridgedToken(tokenInfo: _ChainAsset): boolean;
 export declare function _getTokenMinAmount(tokenInfo: _ChainAsset): string;
 export declare function _isChainEvmCompatible(chainInfo: _ChainInfo): boolean;
 export declare function _isNativeToken(tokenInfo: _ChainAsset): boolean;

package/services/chain-service/utils.js

@@ -88,6 +88,10 @@ export function _getTokenOnChainInfo(tokenInfo) {
   var _tokenInfo$metadata4;
   return (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.onChainInfo;
 }
+export function _isBridgedToken(tokenInfo) {
+  var _tokenInfo$metadata5;
+  return (_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.isBridged;
+}
 export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
 }
@@ -240,16 +244,16 @@ export function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, asset
   return assetRef.path === _AssetRefPath.XCM;
 }
 export function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetType) || '';
+  var _tokenInfo$metadata6;
+  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetType) || '';
 }
 export function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetId) || '-1';
+  var _tokenInfo$metadata7;
+  return ((_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.assetId) || '-1';
 }
 export function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata7;
-  return (_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.multilocation;
+  var _tokenInfo$metadata8;
+  return (_tokenInfo$metadata8 = tokenInfo.metadata) === null || _tokenInfo$metadata8 === void 0 ? void 0 : _tokenInfo$metadata8.multilocation;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

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

@@ -11,5 +11,8 @@ export declare const _STAKING_CHAIN_GROUP: {
     liquidStaking: string[];
     lending: string[];
     krest_network: string[];
+    manta: string[];
 };
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
+export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
+export declare const MANTA_MIN_DELEGATION = 500;

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
@@ -12,11 +12,14 @@ export const _STAKING_CHAIN_GROUP = {
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics
-  ternoa: ['ternoa', 'ternoa_alphanet'],
+  ternoa: ['ternoa'],
   liquidStaking: ['bifrost_dot', 'acala', 'parallel', 'moonbeam'],
   lending: ['interlay'],
-  krest_network: ['krest_network']
+  krest_network: ['krest_network'],
+  manta: ['manta_network']
 };
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
+export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
+export const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
+export const MANTA_MIN_DELEGATION = 500;

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

@@ -23,7 +23,8 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     defaultUnstake: true,
     fastUnstake: true,
     cancelUnstake: false,
-    withdraw: true,
+    withdraw: false,
+    // TODO: Change after verify unstake info
     claimReward: false
   };
   constructor(state, chain) {
@@ -112,6 +113,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
       }
       const balances = _balances;
       const redeemRequests = await substrateApi.api.query.homa.redeemRequests.multi(useAddresses);
+      // This rate is multiple with decimals
       const exchangeRate = await this.getExchangeRate();
       const decimals = BN_TEN.pow(new BN(this.rateDecimals));
       for (let i = 0; i < balances.length; i++) {
@@ -123,14 +125,17 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
         const unstakings = [];
         const redeemRequest = redeemRequests[i].toPrimitive();
         if (redeemRequest) {
+          // If withdrawable = false, redeem request is claimed
           const [redeemAmount, withdrawable] = redeemRequest;
-          const amount = new BN(redeemAmount);
+
+          // Redeem amount in derivative token
+          const amount = new BN(redeemAmount).mul(new BN(exchangeRate)).div(decimals);
           totalBalance = totalBalance.add(amount);
           unlockingBalance = unlockingBalance.add(amount);
           unstakings.push({
             chain: this.chain,
             status: withdrawable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-            claimable: redeemAmount.toString()
+            claimable: amount.toString()
           });
         }
         const result = {
@@ -203,6 +208,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
   async handleYieldRedeem(amount, address, selectedTarget) {
     const substrateApi = await this.substrateApi.isReady;
     const weightedMinAmount = await this.createParamToRedeem(amount, address);
+    // const extrinsic = substrateApi.api.tx.stableAsset.swap(0, 1, 0, amount, weightedMinAmount);
     const extrinsic = substrateApi.api.tx.aggregatedDex.swapWithExactSupply(
     // Swap path
     [{

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

@@ -76,6 +76,8 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     const assetInfo = this.state.getAssetBySlug(this.inputAsset);
     const assetDecimals = 10 ** _getAssetDecimals(assetInfo);
     const rate = parseFloat(exchangeRate.data.slp_polkadot_ratio[0].ratio);
+
+    /** Special for bifrost, the rate is divined and unknown decimals to convert (asset decimal is 10 but the rate length is 18) */
     this.updateExchangeRate(rate);
     return {
       ...this.baseInfo,
@@ -128,7 +130,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
       const [_unlockLedgerList, _currentRelayEra, rate] = await Promise.all([substrateApi.api.query.vtokenMinting.userUnlockLedger.multi(useAddresses.map(address => [address, _getTokenOnChainInfo(inputTokenInfo)])), substrateApi.api.query.vtokenMinting.ongoingTimeUnit(_getTokenOnChainInfo(inputTokenInfo)), this.getExchangeRate()]);
       const exchangeRate = new BigNumber(rate);
       const currentRelayEraObj = _currentRelayEra.toPrimitive();
-      const currentRelayEra = currentRelayEraObj.Era;
+      const currentRelayEra = currentRelayEraObj.era;
       const unlockLedgerList = [];
       const activeBalanceMap = {};
       for (let i = 0; i < balances.length; i++) {
@@ -188,15 +190,20 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
             const isClaimable = unlocking.era - currentRelayEra < 0;
             const remainingEra = unlocking.era - currentRelayEra;
             const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[this.chain];
+            // const currentTimestampMs = Date.now();
+            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
+
             unlockBalance = unlockBalance.add(new BN(unlocking.balance));
             unstakingList.push({
               chain: this.chain,
               status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
               claimable: unlocking.balance,
               waitingTime: waitingTime
+              // targetTimestampMs: targetTimestampMs
             });
           });
         }
+
         const activeToTotalBalance = exchangeRate.multipliedBy(bnActiveBalance.toString());
         const totalBalance = activeToTotalBalance.plus(unlockBalance.toString());
         const result = {

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

@@ -11,7 +11,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
     protected readonly inputAsset: string;
     protected readonly rewardAssets: string[];
     protected readonly feeAssets: string[];
-    readonly minAmountPercent = 0.97;
+    readonly minAmountPercent = 0.96;
     protected readonly rateDecimals = 18;
     protected readonly availableMethod: YieldPoolMethodInfo;
     constructor(state: KoniState, chain: string);

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

@@ -14,7 +14,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
   inputAsset = 'parallel-LOCAL-DOT';
   rewardAssets = ['parallel-LOCAL-DOT'];
   feeAssets = ['parallel-NATIVE-PARA'];
-  minAmountPercent = 0.97;
+  minAmountPercent = 0.96;
   rateDecimals = 18;
   availableMethod = {
     join: true,
@@ -126,6 +126,9 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
             const remainingEra = chunk.era - currentEra;
             const eraTime = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default;
             const waitingTime = remainingEra * eraTime;
+            // const currentTimestampMs = Date.now();
+            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
+
             totalBalance = totalBalance.add(amount);
             unlockingBalance = unlockingBalance.add(amount);
             unstakings.push({
@@ -133,9 +136,11 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
               status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
               claimable: amount.toString(),
               waitingTime: waitingTime
+              // targetTimestampMs: targetTimestampMs
             });
           }
         }
+
         const result = {
           ...this.baseInfo,
           type: this.type,