@subwallet/extension-base 1.1.32-beta.0 → 1.1.33-beta.0

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

@@ -155,7 +155,7 @@ class EarningService {
     });
   }
   async loadData() {
-    await this.getYieldPoolInfoFromDBAndOnline();
+    await this.getYieldPoolInfoFromDB();
     await this.getYieldPositionFromDB();
   }
   persistData() {
@@ -265,18 +265,12 @@ class EarningService {
       });
     };
   }
-  async getYieldPoolInfoFromDBAndOnline() {
+  async getYieldPoolInfoFromDB() {
     // Get online pool data
-    const yieldPoolInfo = await Promise.race([fetchPoolsData(), new Promise(resolve => {
-      setTimeout(() => {
-        resolve({});
-      }, 1200);
-    })]);
+    const yieldPoolInfo = {};
     const existedYieldPoolInfo = await this.dbService.getYieldPools();
     existedYieldPoolInfo.forEach(info => {
-      if (!yieldPoolInfo[info.slug]) {
-        yieldPoolInfo[info.slug] = info;
-      }
+      yieldPoolInfo[info.slug] = info;
     });
     this.yieldPoolInfoSubject.next(yieldPoolInfo);
   }
@@ -297,7 +291,11 @@ class EarningService {
 
       // Update yield pool info
       queue.forEach(item => {
-        yieldPoolInfo[item.slug] = item;
+        const existed = yieldPoolInfo[item.slug];
+        if (item.statistic && (!(existed !== null && existed !== void 0 && existed.lastUpdated) || existed.lastUpdated < ((item === null || item === void 0 ? void 0 : item.lastUpdated) || 0))) {
+          // Only update item has statistic information
+          yieldPoolInfo[item.slug] = item;
+        }
       });
       this.yieldPoolInfoSubject.next(yieldPoolInfo);
 
@@ -305,13 +303,35 @@ class EarningService {
       this.dbService.updateYieldPoolsStore(queue).catch(console.warn);
     }, 300, 900);
   }
+  async fetchingPoolsInfoOnline() {
+    const onlineData = await Promise.race([fetchPoolsData(), new Promise(resolve => {
+      setTimeout(() => {
+        resolve({});
+      }, 1800);
+    })]);
+    Object.values(onlineData).forEach(item => {
+      this.updateYieldPoolInfo(item);
+    });
+  }
   async runSubscribePoolsInfo() {
     await this.eventService.waitChainReady;
     this.runUnsubscribePoolsInfo();
+
+    // Fetching online data
+    await this.fetchingPoolsInfoOnline();
+    const interval = setInterval(() => {
+      this.fetchingPoolsInfoOnline().catch(console.error);
+    }, _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
+
+    // Fetching from chains
     this.subscribePoolsInfo(data => {
+      data.lastUpdated = Date.now();
       this.updateYieldPoolInfo(data);
     }).then(rs => {
-      this.yieldPoolsInfoUnsub = rs;
+      this.yieldPoolsInfoUnsub = () => {
+        rs();
+        clearInterval(interval);
+      };
     }).catch(console.error);
   }
   runUnsubscribePoolsInfo() {

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

@@ -173,14 +173,18 @@ class HistoryService {
 
   // Insert history with check override origin 'app'
   async addHistoryItems(historyItems) {
-    // Prevent override record with original is 'app'
-    const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
-    const excludeKeys = appRecords.map(item => {
-      return `${item.chain}-${item.extrinsicHash}`;
-    });
-    const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${item.extrinsicHash}`;
-      return item.origin === 'app' || !excludeKeys.includes(key);
+    const updateRecords = [];
+    const appItems = this.historySubject.value.filter(i => i.origin === 'app');
+    historyItems.forEach(item => {
+      const needUpdateItem = appItems.find(item_ => item_.extrinsicHash === item.extrinsicHash && item.chain === item_.chain && item.address === item_.address);
+      if (needUpdateItem) {
+        updateRecords.push({
+          ...needUpdateItem,
+          status: item.status
+        });
+        return;
+      }
+      updateRecords.push(item);
     });
     await this.dbService.upsertHistory(updateRecords);
     this.historySubject.next(await this.dbService.getHistories());

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

@@ -42,6 +42,10 @@ class TransactionService {
   }
   constructor(state) {
     this.state = state;
+    this.eventService = state.eventService;
+    this.historyService = state.historyService;
+    this.notificationService = state.notificationService;
+    this.chainService = state.chainService;
   }
   get allTransactions() {
     return Object.values(this.transactions);
@@ -297,6 +301,12 @@ class TransactionService {
         errors: [...data.errors, new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]
       });
     });
+    emitter.on('timeout', data => {
+      this.onTimeOut({
+        ...data,
+        errors: [...data.errors, new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.TIMEOUT)]
+      });
+    });
 
     // Todo: handle any event with transaction.eventsHandler
 
@@ -800,6 +810,45 @@ class TransactionService {
     }
     this.state.eventService.emit('transaction.failed', transaction);
   }
+  onTimeOut(_ref6) {
+    let {
+      blockHash,
+      blockNumber,
+      errors,
+      extrinsicHash,
+      id
+    } = _ref6;
+    const transaction = this.getTransaction(id);
+    const nextStatus = _KoniTypes.ExtrinsicStatus.TIMEOUT;
+    if (transaction) {
+      this.updateTransaction(id, {
+        status: nextStatus,
+        errors,
+        extrinsicHash
+      });
+      this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+        extrinsicHash: extrinsicHash || transaction.extrinsicHash,
+        status: nextStatus,
+        blockNumber: blockNumber || 0,
+        blockHash: blockHash || ''
+      }).catch(console.error);
+      const info = (0, _util.isHex)(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
+      this.notificationService.notify({
+        type: _KoniTypes.NotificationType.ERROR,
+        title: (0, _i18next.t)('Transaction timed out'),
+        message: (0, _i18next.t)('Transaction {{info}} timed out', {
+          replace: {
+            info
+          }
+        }),
+        action: {
+          url: this.getTransactionLink(id)
+        },
+        notifyViaBrowser: true
+      });
+    }
+    this.eventService.emit('transaction.timeout', transaction);
+  }
   generateHashPayload(chain, transaction) {
     var _transaction$nonce;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -814,7 +863,7 @@ class TransactionService {
     };
     return _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
   }
-  async signAndSendEvmTransaction(_ref6) {
+  async signAndSendEvmTransaction(_ref7) {
     var _payload$nonce;
     let {
       address,
@@ -822,7 +871,7 @@ class TransactionService {
       id,
       transaction,
       url
-    } = _ref6;
+    } = _ref7;
     const payload = transaction;
     const evmApi = this.state.chainService.getEvmApi(chain);
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -890,11 +939,11 @@ class TransactionService {
       extrinsicHash: id
     };
     if (isInjected) {
-      this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmWatchTransactionRequest', payload, {}).then(async _ref7 => {
+      this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmWatchTransactionRequest', payload, {}).then(async _ref8 => {
         let {
           isApproved,
           payload
-        } = _ref7;
+        } = _ref8;
         if (isApproved) {
           if (!payload) {
             throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');
@@ -955,11 +1004,11 @@ class TransactionService {
         emitter.emit('error', eventData);
       });
     } else {
-      this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref8 => {
+      this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref9 => {
         let {
           isApproved,
           payload
-        } = _ref8;
+        } = _ref9;
         if (isApproved) {
           let signedTransaction;
           if (!payload) {
@@ -1015,14 +1064,14 @@ class TransactionService {
     }
     return emitter;
   }
-  signAndSendSubstrateTransaction(_ref9) {
+  signAndSendSubstrateTransaction(_ref10) {
     let {
       address,
       chain,
       id,
       transaction,
       url
-    } = _ref9;
+    } = _ref10;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,
@@ -1068,20 +1117,20 @@ class TransactionService {
           eventData.extrinsicHash = txState.txHash.toHex();
           eventData.eventLogs = txState.events;
           // TODO: push block hash and block number into eventData
-          txState.events.filter(_ref10 => {
+          txState.events.filter(_ref11 => {
             let {
               event: {
                 section
               }
-            } = _ref10;
+            } = _ref11;
             return section === 'system';
-          }).forEach(_ref11 => {
+          }).forEach(_ref12 => {
             let {
               event: {
                 data: [error],
                 method
               }
-            } = _ref11;
+            } = _ref12;
             if (method === 'ExtrinsicFailed') {
               eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.SEND_TRANSACTION_FAILED, error.toString()));
               emitter.emit('error', eventData);
@@ -1106,7 +1155,7 @@ class TransactionService {
       const transaction = this.getTransaction(eventData.id);
       if (transaction.status !== _KoniTypes.ExtrinsicStatus.SUCCESS && transaction.status !== _KoniTypes.ExtrinsicStatus.FAIL) {
         eventData.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.TIMEOUT, (0, _i18next.t)('Transaction timeout')));
-        emitter.emit('error', eventData);
+        emitter.emit('timeout', eventData);
         clearTimeout(timeout);
       }
     }, _constants3.TRANSACTION_TIMEOUT);

package/cjs/utils/fetchEvmChainInfo.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getEVMChainInfo = getEVMChainInfo;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const onlineMap = {};
+async function getEVMChainInfo(chainId) {
+  if (Object.keys(onlineMap).length === 0) {
+    const rs = await fetch('https://chainid.network/chains.json');
+    const data = await rs.json();
+    data.forEach(item => {
+      onlineMap[item.chainId] = item;
+    });
+  }
+  return onlineMap[chainId];
+}

package/cjs/utils/index.js

@@ -190,6 +190,30 @@ Object.keys(_object).forEach(function (key) {
     }
   });
 });
+var _fetchStaticData = require("./fetchStaticData");
+Object.keys(_fetchStaticData).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fetchStaticData[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fetchStaticData[key];
+    }
+  });
+});
+var _fetchEvmChainInfo = require("./fetchEvmChainInfo");
+Object.keys(_fetchEvmChainInfo).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fetchEvmChainInfo[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fetchEvmChainInfo[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/koni/api/staking/bonding/amplitude.d.ts

@@ -5,7 +5,7 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 import { Codec } from '@polkadot/types/types';
 export declare function subscribeAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
-export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption, unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
+export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption[], unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
 /**
  * Deprecated
  * */

package/koni/api/staking/bonding/amplitude.js

@@ -4,6 +4,7 @@
 import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getEarningStatusByNominations, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
@@ -18,7 +19,7 @@ export function subscribeAmplitudeStakingMetadata(chain, substrateApi, callback)
     const unstakingDelay = substrateApi.api.consts.parachainStaking.stakeDuration.toString();
     const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
     const blockPerRound = parseFloat(_blockPerRound);
-    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound;
     const unstakingPeriod = blockDuration * parseInt(unstakingDelay);
     callback(chain, {
       chain,
@@ -60,46 +61,52 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
   const nominationList = [];
   const unstakingList = [];
   const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
+  const hasUnstakingInfo = unstakingInfo && Object.values(unstakingInfo).length > 0;
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
-    activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new BN(activeStake);
-    let delegationStatus = EarningStatus.NOT_EARNING;
-    if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
-      delegationStatus = EarningStatus.EARNING_REWARD;
+    const identityPromises = delegatorState.map(delegate => parseIdentity(substrateApi, delegate.owner));
+    const identities = await Promise.all(identityPromises);
+    for (let i = 0; i < delegatorState.length; i++) {
+      const delegate = delegatorState[i];
+      const [identity] = identities[i];
+      activeStake = delegate.amount.toString();
+      const bnActiveStake = new BN(activeStake);
+      let delegationStatus = EarningStatus.NOT_EARNING;
+      if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
+        delegationStatus = EarningStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        status: delegationStatus,
+        chain: chainInfo.slug,
+        validatorAddress: delegate.owner,
+        activeStake: delegate.amount.toString(),
+        validatorMinStake: '0',
+        hasUnstaking: hasUnstakingInfo,
+        validatorIdentity: identity
+      });
     }
-    nominationList.push({
-      status: delegationStatus,
-      chain: chainInfo.slug,
-      validatorAddress: delegatorState.owner,
-      activeStake: delegatorState.amount.toString(),
-      validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
-      validatorIdentity: identity
-    });
-  }
-  if (unstakingInfo && Object.values(unstakingInfo).length > 0) {
-    const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-    const currentBlockInfo = _currentBlockInfo.toPrimitive();
-    const currentBlockNumber = currentBlockInfo.number;
-    const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
-    const blockPerRound = parseFloat(_blockPerRound);
-    const nearestUnstakingBlock = Object.keys(unstakingInfo)[0];
-    const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
-    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    if (hasUnstakingInfo) {
+      const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
+      const currentBlockInfo = _currentBlockInfo.toPrimitive();
+      const currentBlockNumber = currentBlockInfo.number;
+      const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
+      const blockPerRound = parseFloat(_blockPerRound);
+      for (const [unstakingBlock, unstakingAmount] of Object.entries(unstakingInfo)) {
+        const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
-    const waitingTime = remainingBlock * blockDuration;
-    unstakingList.push({
-      chain: chainInfo.slug,
-      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstakingAmount.toString(),
-      waitingTime,
-      validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
-    });
+        const isClaimable = parseInt(unstakingBlock) - currentBlockNumber < 0;
+        const remainingBlock = parseInt(unstakingBlock) - currentBlockNumber;
+        const waitingTime = remainingBlock * blockDuration;
+        unstakingList.push({
+          chain: chainInfo.slug,
+          status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+          claimable: unstakingAmount.toString(),
+          waitingTime,
+          validatorAddress: undefined
+        });
+      }
+    }
   }
   const stakingStatus = getEarningStatusByNominations(new BN(activeStake), nominationList);
   return {
@@ -196,33 +203,61 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
 }
 export async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
-  const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
-  const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
-  const inflationConfig = _inflationConfig.toHuman();
-  const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
-  const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
-  const allCollators = [];
-  for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toPrimitive();
-    const bnTotalStake = new BN(collatorInfo.total);
-    const bnOwnStake = new BN(collatorInfo.stake);
-    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-    allCollators.push({
-      address: collatorInfo.id,
-      totalStake: bnTotalStake.toString(),
-      ownStake: bnOwnStake.toString(),
-      otherStake: bnOtherStake.toString(),
-      nominatorCount: collatorInfo.delegators.length,
-      commission: 0,
-      expectedReturn: delegatorReturn,
-      blocked: false,
-      isVerified: false,
-      minBond: '0',
-      chain,
-      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-    });
+
+  // Noted: Krest do not have reward
+  if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+    const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
+  } else {
+    const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const inflationConfig = _inflationConfig.toHuman();
+    const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
+    const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        expectedReturn: delegatorReturn,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
   }
-  return allCollators;
 }
 export async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;

package/koni/api/staking/bonding/utils.d.ts

@@ -33,6 +33,10 @@ export interface ParachainStakingStakeOption {
     owner: string;
     amount: number;
 }
+export interface KrestDelegateState {
+    delegations: ParachainStakingStakeOption[];
+    total: string;
+}
 export interface ParachainStakingCandidateMetadata {
     bond: string;
     delegationCount: number;

package/koni/api/staking/paraChain.js

@@ -13,7 +13,15 @@ import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, stakingCallback, nominatorStateCallback) {
   return substrateApi.api.queryMulti([[substrateApi.api.query.parachainStaking.delegatorState, address], [substrateApi.api.query.parachainStaking.unstaking, address]], async ([_delegatorState, _unstaking]) => {
-    const delegatorState = _delegatorState.toPrimitive();
+    let delegatorState = [];
+    if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+      const krestDelegatorState = _delegatorState.toPrimitive();
+      const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+      delegatorState = delegatorState.concat(delegates);
+    } else {
+      const delegate = _delegatorState.toPrimitive();
+      delegatorState.push(delegate);
+    }
     const unstakingInfo = _unstaking.toPrimitive();
     const {
       symbol
@@ -42,8 +50,13 @@ function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, s
         unstakings: []
       });
     } else {
-      const activeBalance = delegatorState ? new BN(delegatorState.amount.toString()) : BN_ZERO;
+      let activeBalance = BN_ZERO;
       let unstakingBalance = BN_ZERO;
+      for (const delegate of delegatorState) {
+        var _delegate$amount;
+        const amount = new BN((_delegate$amount = delegate.amount) === null || _delegate$amount === void 0 ? void 0 : _delegate$amount.toString());
+        activeBalance = activeBalance.add(amount);
+      }
       if (unstakingInfo) {
         Object.values(unstakingInfo).forEach(unstakingAmount => {
           const bnUnstakingAmount = new BN(unstakingAmount.toString());
@@ -78,7 +91,15 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
       const _unstakingStates = await substrateApi.api.query.parachainStaking.unstaking.multi(useAddresses);
       await Promise.all(ledgers.map(async (_delegatorState, i) => {
         const owner = reformatAddress(useAddresses[i], 42);
-        const delegatorState = _delegatorState.toPrimitive();
+        let delegatorState = [];
+        if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+          const krestDelegatorState = _delegatorState.toPrimitive();
+          const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+          delegatorState = delegatorState.concat(delegates);
+        } else {
+          const delegate = _delegatorState.toPrimitive();
+          delegatorState.push(delegate);
+        }
         const unstakingInfo = _unstakingStates[i].toPrimitive();
         if (!delegatorState && !unstakingInfo) {
           stakingCallback(chain, {
@@ -103,8 +124,13 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
             unstakings: []
           });
         } else {
-          const activeBalance = delegatorState ? new BN(delegatorState.amount.toString()) : BN_ZERO;
+          let activeBalance = BN_ZERO;
           let unstakingBalance = BN_ZERO;
+          for (const delegate of delegatorState) {
+            var _delegate$amount2;
+            const amount = new BN((_delegate$amount2 = delegate.amount) === null || _delegate$amount2 === void 0 ? void 0 : _delegate$amount2.toString());
+            activeBalance = activeBalance.add(amount);
+          }
           if (unstakingInfo) {
             Object.values(unstakingInfo).forEach(unstakingAmount => {
               const bnUnstakingAmount = new BN(unstakingAmount.toString());
@@ -150,7 +176,7 @@ export async function getAmplitudeUnclaimedStakingReward(substrateApiMap, addres
   });
   const unclaimedRewardList = [];
   await Promise.all(chains.map(async chain => {
-    if (_STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_STAKING_CHAIN_GROUP.kilt.includes(chain)) {
+    if (_STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_STAKING_CHAIN_GROUP.kilt.includes(chain) && !_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
       const networkInfo = networks[chain];
       const apiProps = await substrateApiMap[chain].isReady;
       await Promise.all(useAddresses.map(async address => {

package/koni/api/xcm/xTokens.js

@@ -19,6 +19,6 @@ function getCurrencyId(tokenInfo) {
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge', 'manta_network'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }