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

package/background/KoniTypes.d.ts

@@ -429,6 +429,7 @@ export declare enum ExtrinsicStatus {
     SUCCESS = "success",
     FAIL = "fail",
     CANCELLED = "cancelled",
+    TIMEOUT = "timeout",
     UNKNOWN = "unknown"
 }
 export interface TxHistoryItem {

package/background/KoniTypes.js

@@ -103,6 +103,7 @@ export let ExtrinsicStatus;
   ExtrinsicStatus["SUCCESS"] = "success";
   ExtrinsicStatus["FAIL"] = "fail";
   ExtrinsicStatus["CANCELLED"] = "cancelled";
+  ExtrinsicStatus["TIMEOUT"] = "timeout";
   ExtrinsicStatus["UNKNOWN"] = "unknown";
 })(ExtrinsicStatus || (ExtrinsicStatus = {}));
 export let BasicTxErrorType;

package/cjs/background/KoniTypes.js

@@ -118,6 +118,7 @@ exports.ExtrinsicStatus = ExtrinsicStatus;
   ExtrinsicStatus["SUCCESS"] = "success";
   ExtrinsicStatus["FAIL"] = "fail";
   ExtrinsicStatus["CANCELLED"] = "cancelled";
+  ExtrinsicStatus["TIMEOUT"] = "timeout";
   ExtrinsicStatus["UNKNOWN"] = "unknown";
 })(ExtrinsicStatus || (exports.ExtrinsicStatus = ExtrinsicStatus = {}));
 let BasicTxErrorType;

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

@@ -15,6 +15,7 @@ exports.subscribeAmplitudeStakingMetadata = subscribeAmplitudeStakingMetadata;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/earning-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
@@ -32,7 +33,7 @@ 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 = (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound;
     const unstakingPeriod = blockDuration * parseInt(unstakingDelay);
     callback(chain, {
       chain,
@@ -74,46 +75,52 @@ async function subscribeAmplitudeNominatorMetadata(chainInfo, address, substrate
   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 (0, _utils2.parseIdentity)(substrateApi, delegatorState.owner);
-    activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new _util.BN(activeStake);
-    let delegationStatus = _types.EarningStatus.NOT_EARNING;
-    if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
-      delegationStatus = _types.EarningStatus.EARNING_REWARD;
+    const identityPromises = delegatorState.map(delegate => (0, _utils2.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 _util.BN(activeStake);
+      let delegationStatus = _types.EarningStatus.NOT_EARNING;
+      if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
+        delegationStatus = _types.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 = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._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 = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._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 ? _types.UnstakingStatus.CLAIMABLE : _types.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 ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+          claimable: unstakingAmount.toString(),
+          waitingTime,
+          validatorAddress: undefined
+        });
+      }
+    }
   }
   const stakingStatus = (0, _utils.getEarningStatusByNominations)(new _util.BN(activeStake), nominationList);
   return {
@@ -210,33 +217,61 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
 }
 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 _util.BN(collatorInfo.total);
-    const bnOwnStake = new _util.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 (_constants2._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 _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.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 _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.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;
 }
 async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;

package/cjs/koni/api/staking/paraChain.js

@@ -23,7 +23,15 @@ var _utilCrypto = require("@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 _ref => {
     let [_delegatorState, _unstaking] = _ref;
-    const delegatorState = _delegatorState.toPrimitive();
+    let delegatorState = [];
+    if (_constants._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
@@ -52,8 +60,13 @@ function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, s
         unstakings: []
       });
     } else {
-      const activeBalance = delegatorState ? new _util.BN(delegatorState.amount.toString()) : _util.BN_ZERO;
+      let activeBalance = _util.BN_ZERO;
       let unstakingBalance = _util.BN_ZERO;
+      for (const delegate of delegatorState) {
+        var _delegate$amount;
+        const amount = new _util.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 _util.BN(unstakingAmount.toString());
@@ -88,7 +101,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 = (0, _utils2.reformatAddress)(useAddresses[i], 42);
-        const delegatorState = _delegatorState.toPrimitive();
+        let delegatorState = [];
+        if (_constants._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, {
@@ -113,8 +134,13 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
             unstakings: []
           });
         } else {
-          const activeBalance = delegatorState ? new _util.BN(delegatorState.amount.toString()) : _util.BN_ZERO;
+          let activeBalance = _util.BN_ZERO;
           let unstakingBalance = _util.BN_ZERO;
+          for (const delegate of delegatorState) {
+            var _delegate$amount2;
+            const amount = new _util.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 _util.BN(unstakingAmount.toString());
@@ -160,7 +186,7 @@ async function getAmplitudeUnclaimedStakingReward(substrateApiMap, addresses, ne
   });
   const unclaimedRewardList = [];
   await Promise.all(chains.map(async chain => {
-    if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_constants._STAKING_CHAIN_GROUP.kilt.includes(chain)) {
+    if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_constants._STAKING_CHAIN_GROUP.kilt.includes(chain) && !_constants._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/cjs/koni/api/xcm/xTokens.js

@@ -25,6 +25,6 @@ function getCurrencyId(tokenInfo) {
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.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, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/cjs/koni/background/handlers/Tabs.js

@@ -424,15 +424,32 @@ class KoniTabs {
     } = _ref13;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
+    const chainIdDec = parseInt(chainId, 16);
     const evmState = await this.getEvmState(url);
     if (evmState.chainId === chainId) {
       return null;
     }
-    const [networkKey] = this.#koniState.findNetworkKeyByChainId(parseInt(chainId, 16));
+    const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdDec);
     if (networkKey) {
       await this.#koniState.switchEvmNetworkByUrl((0, _utils2.stripUrl)(url), networkKey);
     } else {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      const onlineData = await (0, _utils2.getEVMChainInfo)(chainIdDec);
+      if (onlineData) {
+        const chainData = {
+          chainId: chainId,
+          rpcUrls: onlineData.rpc.filter(url => url.startsWith('https://')),
+          chainName: onlineData.name,
+          blockExplorerUrls: onlineData.explorers.map(explorer => explorer.url),
+          nativeCurrency: onlineData.nativeCurrency,
+          requestId: id
+        };
+        await this.addEvmChain(id, url, {
+          method: 'wallet_addEthereumChain',
+          params: [chainData]
+        });
+      } else {
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      }
     }
     return null;
   }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.32-0'
+  version: '1.1.33-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -40,7 +40,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge']
@@ -97,7 +97,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   creditcoin: 24,
   vara_network: 12,
   goldberg_testnet: 24,
-  manta_network: 6
+  manta_network: 6,
+  krest_network: 4
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {

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

@@ -11,7 +11,7 @@ const _STAKING_CHAIN_GROUP = {
   relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', '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'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet'],
@@ -20,7 +20,8 @@ const _STAKING_CHAIN_GROUP = {
   // A0 has distinct tokenomics
   ternoa: ['ternoa', 'ternoa_alphanet'],
   liquidStaking: ['bifrost_dot', 'acala', 'parallel', 'moonbeam'],
-  lending: ['interlay']
+  lending: ['interlay'],
+  krest_network: ['krest_network']
 };
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

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

@@ -247,7 +247,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
     if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
-      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount, null).paymentInfo(_constants2.fakeAddress);
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount, undefined, undefined).paymentInfo(_constants2.fakeAddress);
       const mintFeeInfo = _mintFeeInfo.toPrimitive();
       return {
         amount: mintFeeInfo.partialFee.toString(),
@@ -264,7 +264,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
     const substrateApi = await this.substrateApi.isReady;
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const extrinsic = substrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), data.amount, undefined);
+    const extrinsic = substrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), data.amount, undefined, undefined);
     return {
       txChain: this.chain,
       extrinsicType: _KoniTypes.ExtrinsicType.MINT_VDOT,

package/cjs/services/earning-service/handlers/native-staking/amplitude.js

@@ -55,6 +55,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
       const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
       const unstakingDelay = substrateApi.api.consts.parachainStaking.stakeDuration.toString(); // in blocks
       const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
+      const maxUnstakeRequests = substrateApi.api.consts.parachainStaking.maxUnstakeRequests.toPrimitive();
       const blockPerRound = parseFloat(_blockPerRound);
       const roundTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
       const blockDuration = roundTime / blockPerRound; // in hours
@@ -75,7 +76,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
             slug: this.nativeToken.slug
           }],
           maxCandidatePerFarmer: parseInt(maxDelegations),
-          maxWithdrawalRequestPerFarmer: 1,
+          maxWithdrawalRequestPerFarmer: maxUnstakeRequests,
           // by default
           earningThreshold: {
             join: minDelegatorStake,
@@ -109,48 +110,54 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     const nominationList = [];
     const unstakingList = [];
     const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
+    const hasUnstakingInfo = unstakingInfo && Object.values(unstakingInfo).length > 0;
     let activeStake = '0';
     let unstakingBalance = '0';
     if (delegatorState) {
       // delegatorState can be null while unstaking all
-      const [identity] = await (0, _utils2.parseIdentity)(substrateApi, delegatorState.owner);
-      activeStake = delegatorState.amount.toString();
-      const bnActiveStake = new _util.BN(activeStake);
-      let delegationStatus = _types.EarningStatus.NOT_EARNING;
-      if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
-        delegationStatus = _types.EarningStatus.EARNING_REWARD;
+      const identityPromises = delegatorState.map(delegate => (0, _utils2.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 _util.BN(activeStake);
+        let delegationStatus = _types.EarningStatus.NOT_EARNING;
+        if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
+          delegationStatus = _types.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 = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._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 = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-      const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
-      const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
-      const waitingTime = remainingBlock * blockDuration;
-      unstakingBalance = nearestUnstakingAmount.toString();
-      unstakingList.push({
-        chain: chainInfo.slug,
-        status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.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;
+          unstakingBalance = unstakingAmount.toString();
+          unstakingList.push({
+            chain: chainInfo.slug,
+            status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
+            claimable: unstakingAmount.toString(),
+            waitingTime,
+            validatorAddress: undefined
+          });
+        }
+      }
     }
     const totalBalance = new _util.BN(activeStake).add(new _util.BN(unstakingBalance));
     const stakingStatus = (0, _utils.getEarningStatusByNominations)(new _util.BN(activeStake), nominationList);
@@ -179,8 +186,20 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
         const _unstakingStates = await substrateApi.api.query.parachainStaking.unstaking.multi(useAddresses);
         await Promise.all(ledgers.map(async (_delegatorState, i) => {
           const owner = (0, _utils3.reformatAddress)(useAddresses[i], 42);
-          const delegatorState = _delegatorState.toPrimitive();
+          let delegatorState = [];
           const unstakingInfo = _unstakingStates[i].toPrimitive();
+          if (_constants2._STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
+            const krestDelegatorState = _delegatorState.toPrimitive();
+            const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+            if (delegates) {
+              delegatorState = delegatorState.concat(delegates);
+            }
+          } else {
+            const delegate = _delegatorState.toPrimitive();
+            if (delegate) {
+              delegatorState.push(delegate);
+            }
+          }
           if (!delegatorState && !unstakingInfo) {
             resultCallback({
               ...defaultInfo,
@@ -221,7 +240,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     let cancel = false;
     const substrateApi = this.substrateApi;
     await substrateApi.isReady;
-    if (!_constants2._STAKING_CHAIN_GROUP.kilt.includes(this.chain)) {
+    if (!_constants2._STAKING_CHAIN_GROUP.kilt.includes(this.chain) && !_constants2._STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
       await Promise.all(useAddresses.map(async address => {
         const _unclaimedReward = await substrateApi.api.query.parachainStaking.rewards(address);
         if (cancel) {
@@ -247,33 +266,59 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
 
   async getPoolTargets() {
     const chainApi = await this.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 _util.BN(collatorInfo.total);
-      const bnOwnStake = new _util.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: this.chain,
-        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-      });
+    if (_constants2._STAKING_CHAIN_GROUP.krest_network.includes(this.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 _util.BN(collatorInfo.total);
+        const bnOwnStake = new _util.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: this.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 _util.BN(collatorInfo.total);
+        const bnOwnStake = new _util.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: this.chain,
+          isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+        });
+      }
+      return allCollators;
     }
-    return allCollators;
   }
 
   /* Get pool targets */