@subwallet/extension-base 1.0.2-1b → 1.0.2-2

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

@@ -12,9 +12,8 @@ exports.getAstarStakingMetadata = getAstarStakingMetadata;
 exports.getAstarUnbondingExtrinsic = getAstarUnbondingExtrinsic;
 exports.getAstarWithdrawalExtrinsic = getAstarWithdrawalExtrinsic;
 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 _utils2 = require("@subwallet/extension-base/utils");
+var _utils = require("@subwallet/extension-base/utils");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -74,7 +73,6 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   const [_ledger, _era, _stakerInfo] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra(), chainApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const ledger = _ledger.toPrimitive();
   const currentEra = _era.toString();
-  const minDelegatorStake = chainApi.api.consts.dappsStaking.minimumStakingAmount.toString();
   let bnTotalActiveStake = _util.BN_ZERO;
   if (_stakerInfo.length > 0) {
     const dAppInfoMap = {};
@@ -91,13 +89,13 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(_util.BN_ZERO) && bnCurrentStake.gte(new _util.BN(minDelegatorStake)) ? _KoniTypes.StakingStatus.EARNING_REWARD : _KoniTypes.StakingStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
-          status: dappStakingStatus,
+          status: _KoniTypes.StakingStatus.NOT_EARNING,
+          // TODO
           chain,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -124,7 +122,6 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
@@ -132,14 +129,15 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,
     unstakings: unstakingList,
-    status: stakingStatus
+    status: _KoniTypes.StakingStatus.NOT_EARNING // TODO
   };
 }
+
 async function getAstarDappsInfo(networkKey, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
   const allDappsInfo = [];
-  const maxStakerPerContract = (0, _utils2.parseRawNumber)(rawMaxStakerPerContract);
+  const maxStakerPerContract = (0, _utils.parseRawNumber)(rawMaxStakerPerContract);
   const allDappsReq = new Promise(function (resolve) {
     (0, _crossFetch.default)(`https://api.astar.network/api/v1/${networkKey}/dapps-staking/dapps`, {
       method: 'GET'
@@ -148,12 +146,12 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
     }).catch(console.error);
   });
   const [_era, _allDapps] = await Promise.all([chainApi.api.query.dappsStaking.currentEra(), allDappsReq]);
-  const era = (0, _utils2.parseRawNumber)(_era.toHuman());
+  const era = (0, _utils.parseRawNumber)(_era.toHuman());
   const allDapps = _allDapps;
   await Promise.all(allDapps.map(async dapp => {
     const dappName = dapp.name;
     const dappAddress = dapp.address;
-    const dappIcon = (0, _utils2.isUrl)(dapp.iconUrl) ? dapp.iconUrl : undefined;
+    const dappIcon = (0, _utils.isUrl)(dapp.iconUrl) ? dapp.iconUrl : undefined;
     const contractParam = (0, _utilCrypto.isEthereumAddress)(dappAddress) ? {
       Evm: dappAddress
     } : {
@@ -172,7 +170,7 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
     allDappsInfo.push({
       commission: 0,
       expectedReturn: 0,
-      address: dappAddress.toLowerCase(),
+      address: dappAddress,
       totalStake: totalStake,
       ownStake: '0',
       otherStake: totalStake.toString(),
@@ -215,7 +213,7 @@ async function getAstarWithdrawalExtrinsic(substrateApi) {
 async function getAstarClaimRewardExtrinsic(substrateApi, address) {
   const apiPromise = await substrateApi.isReady;
   const [_stakedDapps, _currentEra] = await Promise.all([apiPromise.api.query.dappsStaking.generalStakerInfo.entries(address), apiPromise.api.query.dappsStaking.currentEra()]);
-  const currentEra = (0, _utils2.parseRawNumber)(_currentEra.toHuman());
+  const currentEra = (0, _utils.parseRawNumber)(_currentEra.toHuman());
   const transactions = [];
   for (const item of _stakedDapps) {
     const data = item[0].toHuman();
@@ -232,12 +230,12 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
         staked
       } = stakes[i];
       const bnStaked = new _util.BN(staked.replaceAll(',', ''));
-      const parsedEra = (0, _utils2.parseRawNumber)(era);
+      const parsedEra = (0, _utils.parseRawNumber)(era);
       if (bnStaked.eq(new _util.BN(0))) {
         continue;
       }
       const nextEraData = (_stakes = stakes[i + 1]) !== null && _stakes !== void 0 ? _stakes : null;
-      const nextEra = nextEraData && (0, _utils2.parseRawNumber)(nextEraData.era);
+      const nextEra = nextEraData && (0, _utils.parseRawNumber)(nextEraData.era);
       const isLastEra = i === stakes.length - 1;
       const eraToClaim = isLastEra ? currentEra - parsedEra : nextEra - parsedEra;
       numberOfUnclaimedEra += eraToClaim;

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

@@ -12,8 +12,6 @@ exports.getNominatorMetadata = getNominatorMetadata;
 exports.getUnbondingExtrinsic = getUnbondingExtrinsic;
 exports.getValidatorsInfo = getValidatorsInfo;
 exports.getWithdrawalExtrinsic = getWithdrawalExtrinsic;
-exports.validateBondingCondition = validateBondingCondition;
-exports.validateUnbondingCondition = validateUnbondingCondition;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _amplitude = require("@subwallet/extension-base/koni/api/staking/bonding/amplitude");
 var _astar = require("@subwallet/extension-base/koni/api/staking/bonding/astar");
@@ -25,27 +23,15 @@ var _constants = require("@subwallet/extension-base/services/chain-service/const
 
 // all addresses must be converted to its chain format
 
-function validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, selectedValidator) {
-  if (_constants._STAKING_CHAIN_GROUP.relay.includes(chain)) {
-    return (0, _relayChain.validateRelayUnbondingCondition)(amount, chainStakingMetadata, nominatorMetadata);
-  }
-  return (0, _paraChain.validateParaChainUnbondingCondition)(amount, nominatorMetadata, chainStakingMetadata, selectedValidator);
-}
-function validateBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata) {
-  if (_constants._STAKING_CHAIN_GROUP.relay.includes(chainInfo.slug)) {
-    return (0, _relayChain.validateRelayBondingCondition)(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
-  }
-  return (0, _paraChain.validateParaChainBondingCondition)(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
-}
-async function getChainStakingMetadata(chainInfo, substrateApi) {
-  if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
-    return (0, _astar.getAstarStakingMetadata)(chainInfo.slug, substrateApi);
-  } else if (_constants._STAKING_CHAIN_GROUP.para.includes(chainInfo.slug)) {
-    return (0, _paraChain.getParaChainStakingMetadata)(chainInfo.slug, substrateApi);
-  } else if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chainInfo.slug)) {
-    return (0, _amplitude.getAmplitudeStakingMetadata)(chainInfo.slug, substrateApi);
+async function getChainStakingMetadata(chain, substrateApi) {
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return (0, _astar.getAstarStakingMetadata)(chain, substrateApi);
+  } else if (_constants._STAKING_CHAIN_GROUP.para.includes(chain)) {
+    return (0, _paraChain.getParaChainStakingMetadata)(chain, substrateApi);
+  } else if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return (0, _amplitude.getAmplitudeStakingMetadata)(chain, substrateApi);
   }
-  return (0, _relayChain.getRelayChainStakingMetadata)(chainInfo, substrateApi);
+  return (0, _relayChain.getRelayChainStakingMetadata)(chain, substrateApi);
 }
 async function getNominatorMetadata(chainInfo, address, substrateApi) {
   if (_constants._STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
@@ -115,6 +101,8 @@ async function getClaimRewardExtrinsic(substrateApi, chain, address, stakingType
 async function getCancelWithdrawalExtrinsic(substrateApi, chain, selectedUnstaking) {
   if (_constants._STAKING_CHAIN_GROUP.para.includes(chain)) {
     return (0, _paraChain.getParaCancelWithdrawalExtrinsic)(substrateApi, selectedUnstaking);
+  } else if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return (0, _amplitude.getAmplitudeCancelWithdrawalExtrinsic)(substrateApi);
   }
   return (0, _relayChain.getRelayCancelWithdrawalExtrinsic)(substrateApi, selectedUnstaking);
 }

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

@@ -12,9 +12,6 @@ exports.getParaWithdrawalExtrinsic = getParaWithdrawalExtrinsic;
 exports.getParachainCollatorsInfo = getParachainCollatorsInfo;
 exports.getTuringCancelCompoundingExtrinsic = getTuringCancelCompoundingExtrinsic;
 exports.getTuringCompoundExtrinsic = getTuringCompoundExtrinsic;
-exports.validateParaChainBondingCondition = validateParaChainBondingCondition;
-exports.validateParaChainUnbondingCondition = validateParaChainUnbondingCondition;
-var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 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");
@@ -25,78 +22,6 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainStakingMetadata, selectedCollator) {
-  const errors = [];
-  let targetNomination;
-  for (const nomination of nominatorMetadata.nominations) {
-    if ((0, _utils3.isSameAddress)(nomination.validatorAddress, selectedCollator)) {
-      targetNomination = nomination;
-      break;
-    }
-  }
-  if (!targetNomination) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
-    return errors;
-  }
-  const bnActiveStake = new _util.BN(targetNomination.activeStake);
-  const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-  const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
-  const bnCollatorMinStake = new _util.BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (targetNomination.hasUnstaking) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-  }
-  if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(bnMinStake))) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
-  }
-  return errors;
-}
-function validateParaChainBondingCondition(chainInfo, amount, selectedCollators, address, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  const selectedCollator = selectedCollators[0];
-  let bnTotalStake = new _util.BN(amount);
-  const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
-  const bnCollatorMinStake = new _util.BN(selectedCollator.minBond || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    return errors;
-  }
-  const {
-    bondedValidators
-  } = (0, _utils.getBondedValidators)(nominatorMetadata.nominations);
-  const parsedSelectedCollatorAddress = (0, _utils3.reformatAddress)(selectedCollator.address, 0);
-  if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
-    // new delegation
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    const delegationCount = nominatorMetadata.nominations.length + 1;
-    if (delegationCount > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-    }
-  } else {
-    let currentDelegationAmount = '0';
-    let hasUnstaking = false;
-    for (const delegation of nominatorMetadata.nominations) {
-      if ((0, _utils3.reformatAddress)(delegation.validatorAddress, 0) === parsedSelectedCollatorAddress) {
-        currentDelegationAmount = delegation.activeStake;
-        hasUnstaking = !!delegation.hasUnstaking && delegation.hasUnstaking;
-        break;
-      }
-    }
-    bnTotalStake = bnTotalStake.add(new _util.BN(currentDelegationAmount));
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    if (hasUnstaking) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-    }
-  }
-  return errors;
-}
 async function getParaChainStakingMetadata(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const _round = (await chainApi.api.query.parachainStaking.round()).toHuman();
@@ -150,16 +75,13 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   }
   let bnTotalActiveStake = _util.BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, _identity, _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), chainApi.api.query.identity.identityOf(delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
-    const rawCollatorInfo = _collatorInfo.toHuman();
-    const minDelegation = (rawCollatorInfo === null || rawCollatorInfo === void 0 ? void 0 : rawCollatorInfo.lowestTopDelegationAmount).replaceAll(',', '');
+    const [_delegationScheduledRequests, _identity, _roundInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), chainApi.api.query.identity.identityOf(delegation.owner), chainApi.api.query.parachainStaking.round()]);
     const identityInfo = _identity.toHuman();
     const roundInfo = _roundInfo.toPrimitive();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
     const identity = (0, _utils.parseIdentity)(identityInfo);
     let hasUnstaking = false;
-    let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -186,13 +108,10 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
     const bnStake = new _util.BN(delegation.amount);
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new _util.BN(unstakingMap[delegation.owner].claimable) : _util.BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
-    if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegation))) {
-      delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
-    }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
       chain,
-      status: delegationStatus,
+      status: _KoniTypes.StakingStatus.NOT_EARNING,
       validatorAddress: delegation.owner,
       validatorIdentity: identity,
       activeStake: bnActiveStake.toString(),
@@ -204,11 +123,9 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
     const collatorInfo = _collatorInfo.toPrimitive();
     nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   }));
-  const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
-    status: stakingStatus,
     address: address,
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,

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

@@ -16,10 +16,6 @@ exports.getRelayPoolsInfo = getRelayPoolsInfo;
 exports.getRelayUnbondingExtrinsic = getRelayUnbondingExtrinsic;
 exports.getRelayValidatorsInfo = getRelayValidatorsInfo;
 exports.getRelayWithdrawalExtrinsic = getRelayWithdrawalExtrinsic;
-exports.validatePoolBondingCondition = validatePoolBondingCondition;
-exports.validateRelayBondingCondition = validateRelayBondingCondition;
-exports.validateRelayUnbondingCondition = validateRelayUnbondingCondition;
-var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 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");
@@ -30,91 +26,16 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  const bnActiveStake = new _util.BN(nominatorMetadata.activeStake);
-  const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-  const minStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
-  if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
-  }
-  if (nominatorMetadata.unstakings.length > chainStakingMetadata.maxWithdrawalRequestPerValidator) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_UNSTAKING));
-  }
-  return errors;
-}
-function validatePoolBondingCondition(chainInfo, amount, selectedPool, address, chainStakingMetadata, nominatorMetadata) {
-  // cannot stake when unstake all
-  // amount >= min stake
-  const errors = [];
-  let bnTotalStake = new _util.BN(amount);
-  const bnMinStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
-  if (nominatorMetadata) {
-    const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
-    bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(_util.BN_ZERO)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-    }
-  }
-  if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-  }
-  return errors;
-}
-function validateRelayBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  let bnTotalStake = new _util.BN(amount);
-  const bnMinStake = new _util.BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-    }
-    return errors;
-  }
-  const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
-  bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-  if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-  }
-  if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-  }
-  return errors;
-}
-async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
-  var _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$s, _chainApi$api$query2, _chainApi$api$query2$, _chainApi$api$query3, _chainApi$api$query3$;
-  const chain = chainInfo.slug;
-  const {
-    decimals
-  } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
+async function getRelayChainStakingMetadata(chain, substrateApi) {
+  var _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$n;
   const chainApi = await substrateApi.isReady;
   const _era = await chainApi.api.query.staking.currentEra();
   const currentEra = _era.toString();
   const maxNominations = chainApi.api.consts.staking.maxNominations.toString();
   const maxUnlockingChunks = chainApi.api.consts.staking.maxUnlockingChunks.toString();
   const unlockingEras = chainApi.api.consts.staking.bondingDuration.toString();
-  const [_totalEraStake, _totalIssuance, _auctionCounter, _minimumActiveStake, _minNominatorBond, _minPoolJoin, _eraStakers] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.balances.totalIssuance(), (_chainApi$api$query$a = chainApi.api.query.auctions) === null || _chainApi$api$query$a === void 0 ? void 0 : _chainApi$api$query$a.auctionCounter(), ((_chainApi$api$query = chainApi.api.query) === null || _chainApi$api$query === void 0 ? void 0 : (_chainApi$api$query$s = _chainApi$api$query.staking) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.minimumActiveStake) && ((_chainApi$api$query2 = chainApi.api.query) === null || _chainApi$api$query2 === void 0 ? void 0 : (_chainApi$api$query2$ = _chainApi$api$query2.staking) === null || _chainApi$api$query2$ === void 0 ? void 0 : _chainApi$api$query2$.minimumActiveStake()), chainApi.api.query.staking.minNominatorBond(), (_chainApi$api$query3 = chainApi.api.query) === null || _chainApi$api$query3 === void 0 ? void 0 : (_chainApi$api$query3$ = _chainApi$api$query3.nominationPools) === null || _chainApi$api$query3$ === void 0 ? void 0 : _chainApi$api$query3$.minJoinBond(), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra))]);
-  const eraStakers = _eraStakers;
-  const nominatorList = [];
-  for (const item of eraStakers) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    const rawValidatorStat = item[1].toHuman();
-    const eraNominators = rawValidatorStat.others;
-    for (const nominator of eraNominators) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      if (!nominatorList.includes(nominator.who)) {
-        nominatorList.push(nominator.who);
-      }
-    }
-  }
-  const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
-  const minNominatorBond = _minNominatorBond.toString();
-  const bnMinActiveStake = new _util.BN(minActiveStake);
-  const bnMinNominatorBond = new _util.BN(minNominatorBond);
-  const minStake = bnMinActiveStake.gt(bnMinNominatorBond) ? bnMinActiveStake : bnMinNominatorBond;
+  const [_totalEraStake, _totalIssuance, _auctionCounter, _minimumActiveStake, _minPoolJoin] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.balances.totalIssuance(), (_chainApi$api$query$a = chainApi.api.query.auctions) === null || _chainApi$api$query$a === void 0 ? void 0 : _chainApi$api$query$a.auctionCounter(), chainApi.api.query.staking.minimumActiveStake(), (_chainApi$api$query = chainApi.api.query) === null || _chainApi$api$query === void 0 ? void 0 : (_chainApi$api$query$n = _chainApi$api$query.nominationPools) === null || _chainApi$api$query$n === void 0 ? void 0 : _chainApi$api$query$n.minJoinBond()]);
+  const minStake = _minimumActiveStake.toString();
   const minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
   const rawTotalEraStake = _totalEraStake.toString();
   const rawTotalIssuance = _totalIssuance.toString();
@@ -132,30 +53,21 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     expectedReturn,
     // in %, annually
     inflation,
-    minStake: minStake.toString(),
-    minPoolBonding: (10 ** decimals).toString(),
-    // default is 1
+    minStake,
     maxValidatorPerNominator: parseInt(maxNominations),
     maxWithdrawalRequestPerValidator: parseInt(maxUnlockingChunks),
     allowCancelUnstaking: true,
     unstakingPeriod: unlockingPeriod,
-    minJoinNominationPool: minPoolJoin,
-    nominatorCount: nominatorList.length
+    minJoinNominationPool: minPoolJoin
   };
 }
 async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi) {
-  var _chainApi$api$query4, _chainApi$api$query4$, _chainApi$api$query5, _chainApi$api$query5$, _chainApi$api$query6, _chainApi$api$query6$, _chainApi$api$query7, _chainApi$api$query7$, _chainApi$api$query8, _chainApi$api$query8$, _chainApi$api$query9, _chainApi$api$query9$, _chainApi$api$query10, _chainApi$api$query11;
   if ((0, _utilCrypto.isEthereumAddress)(address)) {
     return;
   }
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
-  const [_ledger, _nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_chainApi$api$query4 = chainApi.api.query) === null || _chainApi$api$query4 === void 0 ? void 0 : (_chainApi$api$query4$ = _chainApi$api$query4.staking) === null || _chainApi$api$query4$ === void 0 ? void 0 : _chainApi$api$query4$.ledger(address), (_chainApi$api$query5 = chainApi.api.query) === null || _chainApi$api$query5 === void 0 ? void 0 : (_chainApi$api$query5$ = _chainApi$api$query5.staking) === null || _chainApi$api$query5$ === void 0 ? void 0 : _chainApi$api$query5$.nominators(address), (_chainApi$api$query6 = chainApi.api.query) === null || _chainApi$api$query6 === void 0 ? void 0 : (_chainApi$api$query6$ = _chainApi$api$query6.staking) === null || _chainApi$api$query6$ === void 0 ? void 0 : _chainApi$api$query6$.currentEra(), (_chainApi$api$query7 = chainApi.api.query) === null || _chainApi$api$query7 === void 0 ? void 0 : (_chainApi$api$query7$ = _chainApi$api$query7.staking) === null || _chainApi$api$query7$ === void 0 ? void 0 : _chainApi$api$query7$.bonded(address), ((_chainApi$api$query8 = chainApi.api.query) === null || _chainApi$api$query8 === void 0 ? void 0 : (_chainApi$api$query8$ = _chainApi$api$query8.staking) === null || _chainApi$api$query8$ === void 0 ? void 0 : _chainApi$api$query8$.minimumActiveStake) && ((_chainApi$api$query9 = chainApi.api.query) === null || _chainApi$api$query9 === void 0 ? void 0 : (_chainApi$api$query9$ = _chainApi$api$query9.staking) === null || _chainApi$api$query9$ === void 0 ? void 0 : _chainApi$api$query9$.minimumActiveStake()), (_chainApi$api$query10 = chainApi.api.query) === null || _chainApi$api$query10 === void 0 ? void 0 : (_chainApi$api$query11 = _chainApi$api$query10.staking) === null || _chainApi$api$query11 === void 0 ? void 0 : _chainApi$api$query11.minNominatorBond()]);
-  const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
-  const minNominatorBond = _minNominatorBond.toString();
-  const bnMinActiveStake = new _util.BN(minActiveStake);
-  const bnMinNominatorBond = new _util.BN(minNominatorBond);
-  const minStake = bnMinActiveStake.gt(bnMinNominatorBond) ? bnMinActiveStake : bnMinNominatorBond;
+  const [_ledger, _nominations, _currentEra, _bonded] = await Promise.all([chainApi.api.query.staking.ledger(address), chainApi.api.query.staking.nominators(address), chainApi.api.query.staking.currentEra(), chainApi.api.query.staking.bonded(address)]);
   const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
   const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
   const ledger = _ledger.toPrimitive();
@@ -165,6 +77,7 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   if (!ledger) {
     return;
   }
+  let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const activeStake = ledger.active.toString();
   const nominationList = [];
   const unstakingList = [];
@@ -179,10 +92,7 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
       const topNominators = eraStaker.others.map(nominator => {
         return nominator.who;
       });
-      if (!topNominators.includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
-        // if nominator has target but not in nominator list
-        nominationStatus = _KoniTypes.StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
+      if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
         // if address in top nominators
         nominationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
       }
@@ -196,20 +106,11 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
     }));
   }
 
-  let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-  const bnActiveStake = new _util.BN(activeStake);
-  let waitingNominationCount = 0;
-  if (bnActiveStake.gte(minStake)) {
-    for (const nomination of nominationList) {
-      if (nomination.status === _KoniTypes.StakingStatus.EARNING_REWARD) {
-        // only need 1 earning nomination to count
-        stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
-      } else if (nomination.status === _KoniTypes.StakingStatus.WAITING) {
-        waitingNominationCount += 1;
-      }
-    }
-    if (waitingNominationCount === nominationList.length) {
-      stakingStatus = _KoniTypes.StakingStatus.WAITING;
+  for (const nomination of nominationList) {
+    if (nomination.status === _KoniTypes.StakingStatus.EARNING_REWARD) {
+      // only need 1 earning nomination to count
+      stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
+      break;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -288,10 +189,6 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
       waitingTime: waitingTime > 0 ? waitingTime : 0
     });
   });
-  const bnActiveStake = new _util.BN(poolMemberInfo.points.toString());
-  if (!bnActiveStake.gt(_util.BN_ZERO)) {
-    stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-  }
   return {
     chain: chainInfo.slug,
     type: _KoniTypes.StakingType.POOLED,
@@ -352,9 +249,9 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   }
   const extraInfoMap = {};
   await Promise.all(allValidators.map(async address => {
-    var _chainApi$api$query12, _chainApi$api$query13, _identityInfo$judgeme;
+    var _chainApi$api$query2, _chainApi$api$query2$, _identityInfo$judgeme;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const [_commissionInfo, _identityInfo] = await Promise.all([chainApi.api.query.staking.validators(address), (_chainApi$api$query12 = chainApi.api.query) === null || _chainApi$api$query12 === void 0 ? void 0 : (_chainApi$api$query13 = _chainApi$api$query12.identity) === null || _chainApi$api$query13 === void 0 ? void 0 : _chainApi$api$query13.identityOf(address)]);
+    const [_commissionInfo, _identityInfo] = await Promise.all([chainApi.api.query.staking.validators(address), (_chainApi$api$query2 = chainApi.api.query) === null || _chainApi$api$query2 === void 0 ? void 0 : (_chainApi$api$query2$ = _chainApi$api$query2.identity) === null || _chainApi$api$query2$ === void 0 ? void 0 : _chainApi$api$query2$.identityOf(address)]);
     const commissionInfo = _commissionInfo.toHuman();
     const identityInfo = _identityInfo ? _identityInfo.toHuman() : null;
     let identity;

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

@@ -16,7 +16,6 @@ exports.getInflationParams = getInflationParams;
 exports.getParaCurrentInflation = getParaCurrentInflation;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
-exports.getStakingStatusByNominations = getStakingStatusByNominations;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isShowNominationByValidator = isShowNominationByValidator;
@@ -151,8 +150,11 @@ function getBondedValidators(nominations) {
   const bondedValidators = [];
   let nominationCount = 0;
   for (const nomination of nominations) {
-    nominationCount += 1;
-    bondedValidators.push((0, _utils.reformatAddress)(nomination.validatorAddress, 0));
+    const bnActiveStake = new _util.BN(nomination.activeStake);
+    if (bnActiveStake.gt(_util.BN_ZERO)) {
+      nominationCount += 1;
+      bondedValidators.push((0, _utils.reformatAddress)(nomination.validatorAddress, 0));
+    }
   }
   return {
     nominationCount,
@@ -195,15 +197,13 @@ function getStakingAvailableActionsByChain(chain, type) {
   }
   return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
 }
-function getStakingAvailableActionsByNominator(nominatorMetadata, unclaimedReward) {
+function getStakingAvailableActionsByNominator(nominatorMetadata) {
   const result = [StakingAction.STAKE];
   const bnActiveStake = new _util.BN(nominatorMetadata.activeStake);
   if (nominatorMetadata.activeStake && bnActiveStake.gt(_util.BN_ZERO)) {
     result.push(StakingAction.UNSTAKE);
-    const isAstarNetwork = _constants._STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain);
-    const isAmplitudeNetwork = _constants._STAKING_CHAIN_GROUP.amplitude.includes(nominatorMetadata.chain);
-    const bnUnclaimedReward = new _util.BN(unclaimedReward || '0');
-    if ((nominatorMetadata.type === _KoniTypes.StakingType.POOLED || isAmplitudeNetwork) && bnUnclaimedReward.gt(_util.BN_ZERO) || isAstarNetwork) {
+    const isChainAllowClaimReward = _constants._STAKING_CHAIN_GROUP.amplitude.includes(nominatorMetadata.chain) || _constants._STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain);
+    if (nominatorMetadata.type === _KoniTypes.StakingType.POOLED || isChainAllowClaimReward) {
       result.push(StakingAction.CLAIM_REWARD);
     }
   }
@@ -245,23 +245,4 @@ function getWithdrawalInfo(nominatorMetadata) {
     }
   }
   return result;
-}
-function getStakingStatusByNominations(bnTotalActiveStake, nominationList) {
-  let stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
-  if (bnTotalActiveStake.isZero()) {
-    stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-  } else {
-    let invalidDelegationCount = 0;
-    for (const nomination of nominationList) {
-      if (nomination.status === _KoniTypes.StakingStatus.NOT_EARNING) {
-        invalidDelegationCount += 1;
-      }
-    }
-    if (invalidDelegationCount > 0 && invalidDelegationCount < nominationList.length) {
-      stakingStatus = _KoniTypes.StakingStatus.PARTIALLY_EARNING;
-    } else if (invalidDelegationCount === nominationList.length) {
-      stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-    }
-  }
-  return stakingStatus;
 }

package/cjs/koni/api/tokens/wasm/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getPSP22ContractPromise = getPSP22ContractPromise;
 exports.getPSP34ContractPromise = getPSP34ContractPromise;
 exports.getPSP34TransferExtrinsic = getPSP34TransferExtrinsic;
-var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
 var _apiContract = require("@polkadot/api-contract");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -23,10 +22,10 @@ async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress
   const onChainOption = params.onChainOption;
   try {
     const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
-    // @ts-ignore
-    const gasLimit = await (0, _utils.getWasmContractGasLimit)(substrateApi.api, senderAddress, 'psp34::transfer', contractPromise, {}, [recipientAddress, onChainOption, {}]);
-
-    // @ts-ignore
+    const transferQuery = await contractPromise.query['psp34::transfer'](senderAddress, {
+      gasLimit: -1
+    }, recipientAddress, onChainOption, {});
+    const gasLimit = transferQuery.gasRequired.toString();
     return contractPromise.tx['psp34::transfer']({
       gasLimit
     }, recipientAddress, onChainOption, {});

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -42,7 +42,7 @@ function getAssetLocation(tokenInfo, sendingValue) {
   };
 }
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = (0, _utils.getDestWeight)();
+  const weightParam = _utils.NETWORK_USE_UNLIMITED_WEIGHT.includes(originChainInfo.slug) ? _utils.POLKADOT_UNLIMITED_WEIGHT : _utils.FOUR_INSTRUCTIONS_WEIGHT;
   const beneficiary = (0, _utils.getBeneficiary)(originChainInfo, destinationChainInfo, recipientAddress);
   const destination = getDestinationChainLocation(destinationChainInfo);
   const assetLocation = getAssetLocation(tokenInfo, value);