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

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

@@ -1,86 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, getParaCurrentInflation, getStakingStatusByNominations, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { getBondedValidators, getParaCurrentInflation, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { isSameAddress, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-export function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainStakingMetadata, selectedCollator) {
-  const errors = [];
-  let targetNomination;
-  for (const nomination of nominatorMetadata.nominations) {
-    if (isSameAddress(nomination.validatorAddress, selectedCollator)) {
-      targetNomination = nomination;
-      break;
-    }
-  }
-  if (!targetNomination) {
-    errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
-    return errors;
-  }
-  const bnActiveStake = new BN(targetNomination.activeStake);
-  const bnRemainingStake = bnActiveStake.sub(new BN(amount));
-  const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
-  const bnCollatorMinStake = new BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (targetNomination.hasUnstaking) {
-    errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-  }
-  if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(bnMinStake))) {
-    errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE));
-  }
-  return errors;
-}
-export function validateParaChainBondingCondition(chainInfo, amount, selectedCollators, address, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  const selectedCollator = selectedCollators[0];
-  let bnTotalStake = new BN(amount);
-  const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
-  const bnCollatorMinStake = new BN(selectedCollator.minBond || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    return errors;
-  }
-  const {
-    bondedValidators
-  } = getBondedValidators(nominatorMetadata.nominations);
-  const parsedSelectedCollatorAddress = reformatAddress(selectedCollator.address, 0);
-  if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
-    // new delegation
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    const delegationCount = nominatorMetadata.nominations.length + 1;
-    if (delegationCount > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new TransactionError(StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-    }
-  } else {
-    let currentDelegationAmount = '0';
-    let hasUnstaking = false;
-    for (const delegation of nominatorMetadata.nominations) {
-      if (reformatAddress(delegation.validatorAddress, 0) === parsedSelectedCollatorAddress) {
-        currentDelegationAmount = delegation.activeStake;
-        hasUnstaking = !!delegation.hasUnstaking && delegation.hasUnstaking;
-        break;
-      }
-    }
-    bnTotalStake = bnTotalStake.add(new BN(currentDelegationAmount));
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    if (hasUnstaking) {
-      errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-    }
-  }
-  return errors;
-}
 export async function getParaChainStakingMetadata(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const _round = (await chainApi.api.query.parachainStaking.round()).toHuman();
@@ -134,16 +61,13 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
   }
   let bnTotalActiveStake = 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 = parseIdentity(identityInfo);
     let hasUnstaking = false;
-    let delegationStatus = StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -170,13 +94,10 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const bnStake = new BN(delegation.amount);
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new BN(unstakingMap[delegation.owner].claimable) : BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
-    if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegation))) {
-      delegationStatus = StakingStatus.EARNING_REWARD;
-    }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
       chain,
-      status: delegationStatus,
+      status: StakingStatus.NOT_EARNING,
       validatorAddress: delegation.owner,
       validatorIdentity: identity,
       activeStake: bnActiveStake.toString(),
@@ -188,11 +109,9 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const collatorInfo = _collatorInfo.toPrimitive();
     nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   }));
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,
-    status: stakingStatus,
     address: address,
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,

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

@@ -1,5 +1,4 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainStakingMetadata, NominationPoolInfo, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export interface PalletStakingNominations {
@@ -18,10 +17,7 @@ export interface PalletStakingStakingLedger {
     unlocking: UnlockingChunk[];
     claimedRewards: number[];
 }
-export declare function validateRelayUnbondingCondition(amount: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata: NominatorMetadata): TransactionError[];
-export declare function validatePoolBondingCondition(chainInfo: _ChainInfo, amount: string, selectedPool: NominationPoolInfo, address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
-export declare function validateRelayBondingCondition(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
-export declare function getRelayChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
+export declare function getRelayChainStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getRelayChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getRelayChainPoolMemberMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getRelayValidatorsInfo(chain: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;

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

@@ -1,99 +1,23 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateValidatorStakedReturn, getCommission, parseIdentity, parsePoolStashAddress, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getChainNativeTokenBasicInfo, _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-export function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  const bnActiveStake = new BN(nominatorMetadata.activeStake);
-  const bnRemainingStake = bnActiveStake.sub(new BN(amount));
-  const minStake = new BN(chainStakingMetadata.minPoolBonding || '0');
-  if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
-    errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE));
-  }
-  if (nominatorMetadata.unstakings.length > chainStakingMetadata.maxWithdrawalRequestPerValidator) {
-    errors.push(new TransactionError(StakingTxErrorType.EXCEED_MAX_UNSTAKING));
-  }
-  return errors;
-}
-export function validatePoolBondingCondition(chainInfo, amount, selectedPool, address, chainStakingMetadata, nominatorMetadata) {
-  // cannot stake when unstake all
-  // amount >= min stake
-  const errors = [];
-  let bnTotalStake = new BN(amount);
-  const bnMinStake = new BN(chainStakingMetadata.minPoolBonding || '0');
-  if (nominatorMetadata) {
-    const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
-    bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(BN_ZERO)) {
-      errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
-    }
-  }
-  if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-  }
-  return errors;
-}
-export function validateRelayBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata) {
-  const errors = [];
-  let bnTotalStake = new BN(amount);
-  const bnMinStake = new BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
-    if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-    }
-    if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new TransactionError(StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-    }
-    return errors;
-  }
-  const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
-  bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-  if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
-  }
-  if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-    errors.push(new TransactionError(StakingTxErrorType.EXCEED_MAX_NOMINATIONS));
-  }
-  return errors;
-}
-export 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
-  } = _getChainNativeTokenBasicInfo(chainInfo);
+export 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 BN(minActiveStake);
-  const bnMinNominatorBond = new 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();
@@ -111,30 +35,21 @@ export 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
   };
 }
 export 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 (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 BN(minActiveStake);
-  const bnMinNominatorBond = new 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();
@@ -144,6 +59,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   if (!ledger) {
     return;
   }
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const activeStake = ledger.active.toString();
   const nominationList = [];
   const unstakingList = [];
@@ -158,10 +74,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
       const topNominators = eraStaker.others.map(nominator => {
         return nominator.who;
       });
-      if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
-        // if nominator has target but not in nominator list
-        nominationStatus = StakingStatus.WAITING;
-      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
+      if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
         nominationStatus = StakingStatus.EARNING_REWARD;
       }
@@ -175,20 +88,11 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     }));
   }
 
-  let stakingStatus = StakingStatus.NOT_EARNING;
-  const bnActiveStake = new BN(activeStake);
-  let waitingNominationCount = 0;
-  if (bnActiveStake.gte(minStake)) {
-    for (const nomination of nominationList) {
-      if (nomination.status === StakingStatus.EARNING_REWARD) {
-        // only need 1 earning nomination to count
-        stakingStatus = StakingStatus.EARNING_REWARD;
-      } else if (nomination.status === StakingStatus.WAITING) {
-        waitingNominationCount += 1;
-      }
-    }
-    if (waitingNominationCount === nominationList.length) {
-      stakingStatus = StakingStatus.WAITING;
+  for (const nomination of nominationList) {
+    if (nomination.status === StakingStatus.EARNING_REWARD) {
+      // only need 1 earning nomination to count
+      stakingStatus = StakingStatus.EARNING_REWARD;
+      break;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -266,10 +170,6 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
       waitingTime: waitingTime > 0 ? waitingTime : 0
     });
   });
-  const bnActiveStake = new BN(poolMemberInfo.points.toString());
-  if (!bnActiveStake.gt(BN_ZERO)) {
-    stakingStatus = StakingStatus.NOT_EARNING;
-  }
   return {
     chain: chainInfo.slug,
     type: StakingType.POOLED,
@@ -330,9 +230,9 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
   }
   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/koni/api/staking/bonding/utils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { NominationInfo, NominatorMetadata, StakingStatus, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
 import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
@@ -149,7 +149,6 @@ export declare enum StakingAction {
     CANCEL_UNSTAKE = "CANCEL_UNSTAKE"
 }
 export declare function getStakingAvailableActionsByChain(chain: string, type: StakingType): StakingAction[];
-export declare function getStakingAvailableActionsByNominator(nominatorMetadata: NominatorMetadata, unclaimedReward?: string): StakingAction[];
+export declare function getStakingAvailableActionsByNominator(nominatorMetadata: NominatorMetadata): StakingAction[];
 export declare function isActionFromValidator(stakingType: StakingType, chain: string): boolean;
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;
-export declare function getStakingStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): StakingStatus;

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

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
@@ -125,8 +125,11 @@ export function getBondedValidators(nominations) {
   const bondedValidators = [];
   let nominationCount = 0;
   for (const nomination of nominations) {
-    nominationCount += 1;
-    bondedValidators.push(reformatAddress(nomination.validatorAddress, 0));
+    const bnActiveStake = new BN(nomination.activeStake);
+    if (bnActiveStake.gt(BN_ZERO)) {
+      nominationCount += 1;
+      bondedValidators.push(reformatAddress(nomination.validatorAddress, 0));
+    }
   }
   return {
     nominationCount,
@@ -168,15 +171,13 @@ export function getStakingAvailableActionsByChain(chain, type) {
   }
   return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
 }
-export function getStakingAvailableActionsByNominator(nominatorMetadata, unclaimedReward) {
+export function getStakingAvailableActionsByNominator(nominatorMetadata) {
   const result = [StakingAction.STAKE];
   const bnActiveStake = new BN(nominatorMetadata.activeStake);
   if (nominatorMetadata.activeStake && bnActiveStake.gt(BN_ZERO)) {
     result.push(StakingAction.UNSTAKE);
-    const isAstarNetwork = _STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain);
-    const isAmplitudeNetwork = _STAKING_CHAIN_GROUP.amplitude.includes(nominatorMetadata.chain);
-    const bnUnclaimedReward = new BN(unclaimedReward || '0');
-    if ((nominatorMetadata.type === StakingType.POOLED || isAmplitudeNetwork) && bnUnclaimedReward.gt(BN_ZERO) || isAstarNetwork) {
+    const isChainAllowClaimReward = _STAKING_CHAIN_GROUP.amplitude.includes(nominatorMetadata.chain) || _STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain);
+    if (nominatorMetadata.type === StakingType.POOLED || isChainAllowClaimReward) {
       result.push(StakingAction.CLAIM_REWARD);
     }
   }
@@ -218,23 +219,4 @@ export function getWithdrawalInfo(nominatorMetadata) {
     }
   }
   return result;
-}
-export function getStakingStatusByNominations(bnTotalActiveStake, nominationList) {
-  let stakingStatus = StakingStatus.EARNING_REWARD;
-  if (bnTotalActiveStake.isZero()) {
-    stakingStatus = StakingStatus.NOT_EARNING;
-  } else {
-    let invalidDelegationCount = 0;
-    for (const nomination of nominationList) {
-      if (nomination.status === StakingStatus.NOT_EARNING) {
-        invalidDelegationCount += 1;
-      }
-    }
-    if (invalidDelegationCount > 0 && invalidDelegationCount < nominationList.length) {
-      stakingStatus = StakingStatus.PARTIALLY_EARNING;
-    } else if (invalidDelegationCount === nominationList.length) {
-      stakingStatus = StakingStatus.NOT_EARNING;
-    }
-  }
-  return stakingStatus;
 }

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

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _PSP22_ABI, _PSP34_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import { ContractPromise } from '@polkadot/api-contract';
 export function getPSP22ContractPromise(apiPromise, contractAddress) {
@@ -15,10 +14,10 @@ export async function getPSP34TransferExtrinsic(networkKey, substrateApi, sender
   const onChainOption = params.onChainOption;
   try {
     const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
-    // @ts-ignore
-    const gasLimit = await 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/koni/api/xcm/polkadotXcm.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getBeneficiary, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { FOUR_INSTRUCTIONS_WEIGHT, getBeneficiary, NETWORK_USE_UNLIMITED_WEIGHT, POLKADOT_UNLIMITED_WEIGHT } from '@subwallet/extension-base/koni/api/xcm/utils';
 import { _getSubstrateParaId, _getXcmAssetMultilocation, _isSubstrateParaChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 function getDestinationChainLocation(destinationChainInfo) {
   if (_isSubstrateParaChain(destinationChainInfo)) {
@@ -36,7 +36,7 @@ function getAssetLocation(tokenInfo, sendingValue) {
   };
 }
 export function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = getDestWeight();
+  const weightParam = NETWORK_USE_UNLIMITED_WEIGHT.includes(originChainInfo.slug) ? POLKADOT_UNLIMITED_WEIGHT : FOUR_INSTRUCTIONS_WEIGHT;
   const beneficiary = getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress);
   const destination = getDestinationChainLocation(destinationChainInfo);
   const assetLocation = getAssetLocation(tokenInfo, value);

package/koni/api/xcm/utils.d.ts

@@ -1,15 +1,16 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-export declare const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-export declare const FOUR_INSTRUCTIONS_LIMITED_WEIGHT: {
+export declare const FOUR_INSTRUCTIONS_WEIGHT: {
     Limited: number;
 };
+export declare const POLKADOT_LIMITED_WEIGHT = 1000000000;
+export declare const POLKADOT_UNLIMITED_WEIGHT = "Unlimited";
 export declare function getReceiverLocation(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, toAddress: string): Record<string, any>;
-export declare function getBeneficiary(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, recipientAddress: string, version?: string): {
-    [x: string]: {
+export declare function getBeneficiary(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, recipientAddress: string): {
+    V1: {
         parents: number;
         interior: {
             X1: Record<string, any>;
         };
     };
 };
-export declare function getDestWeight(): string;
+export declare const NETWORK_USE_UNLIMITED_WEIGHT: string[];

package/koni/api/xcm/utils.js

@@ -2,19 +2,20 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainSubstrateAddressPrefix, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
-export const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-export const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
+export const FOUR_INSTRUCTIONS_WEIGHT = {
   Limited: 5000000000
 };
+export const POLKADOT_LIMITED_WEIGHT = 1000000000;
+export const POLKADOT_UNLIMITED_WEIGHT = 'Unlimited';
 
 // get multilocation for destination chain from a parachain
 
 export function getReceiverLocation(originChainInfo, destinationChainInfo, toAddress) {
-  if (destinationChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM) {
-    const ss58Address = evmToAddress(toAddress, 2006); // TODO: shouldn't pass addressPrefix directly
-
+  // @ts-ignore
+  if (destinationChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM || destinationChainInfo.slug === 'astarEvm') {
+    const ss58Address = evmToAddress(toAddress, _getChainSubstrateAddressPrefix(destinationChainInfo));
     return {
       AccountId32: {
         network: 'Any',
@@ -37,10 +38,10 @@ export function getReceiverLocation(originChainInfo, destinationChainInfo, toAdd
     }
   };
 }
-export function getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress, version = 'V1') {
+export function getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress) {
   const receiverLocation = getReceiverLocation(originChainInfo, destinationChainInfo, recipientAddress);
   return {
-    [version]: {
+    V1: {
       parents: 0,
       interior: {
         X1: receiverLocation
@@ -48,10 +49,4 @@ export function getBeneficiary(originChainInfo, destinationChainInfo, recipientA
     }
   };
 }
-export function getDestWeight() {
-  return 'Unlimited';
-  // return api.tx.xTokens.transfer.meta.args[3].type.toString() ===
-  // 'XcmV2WeightLimit'
-  //   ? 'Unlimited'
-  //   : FOUR_INSTRUCTIONS_WEIGHT;
-}
+export const NETWORK_USE_UNLIMITED_WEIGHT = ['acala', 'karura', 'statemint', 'moonriver'];

package/koni/api/xcm/xTokens.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { FOUR_INSTRUCTIONS_WEIGHT, getDestWeight, getReceiverLocation } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { FOUR_INSTRUCTIONS_WEIGHT, getReceiverLocation, NETWORK_USE_UNLIMITED_WEIGHT, POLKADOT_UNLIMITED_WEIGHT } from '@subwallet/extension-base/koni/api/xcm/utils';
 import { _XCM_TYPE } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getSubstrateParaId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _getXcmTransferType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 function getCurrencyId(tokenInfo) {
@@ -48,6 +48,6 @@ function getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo,
   };
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
+  const weightParam = NETWORK_USE_UNLIMITED_WEIGHT.includes(originChainInfo.slug) ? POLKADOT_UNLIMITED_WEIGHT : FOUR_INSTRUCTIONS_WEIGHT;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, recipientAddress), weightParam);
 }

package/koni/api/xcm/xcmPallet.js

@@ -1,11 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getBeneficiary, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { FOUR_INSTRUCTIONS_WEIGHT, getBeneficiary, NETWORK_USE_UNLIMITED_WEIGHT, POLKADOT_UNLIMITED_WEIGHT } from '@subwallet/extension-base/koni/api/xcm/utils';
 import { _getSubstrateParaId } from '@subwallet/extension-base/services/chain-service/utils';
-function getDestinationChainLocation(destinationChainInfo, version = 'V1') {
+function getDestinationChainLocation(destinationChainInfo) {
   return {
-    [version]: {
+    V1: {
       parents: 0,
       interior: {
         X1: {
@@ -15,10 +15,10 @@ function getDestinationChainLocation(destinationChainInfo, version = 'V1') {
     }
   };
 }
-function getTokenLocation(sendingValue, version = 'V2') {
+function getTokenLocation(sendingValue) {
   return {
     // always native token of relaychain
-    [version]: [{
+    V1: [{
       id: {
         Concrete: {
           parents: 0,
@@ -34,11 +34,10 @@ function getTokenLocation(sendingValue, version = 'V2') {
 
 // this pallet is only used by Relaychains
 export function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = getDestWeight();
-  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V2' : 'V1';
-  const destination = getDestinationChainLocation(destinationChainInfo, xcmVer);
-  const beneficiary = getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress, xcmVer);
-  const tokenLocation = getTokenLocation(value, xcmVer);
+  const weightParam = NETWORK_USE_UNLIMITED_WEIGHT.includes(originChainInfo.slug) ? POLKADOT_UNLIMITED_WEIGHT : FOUR_INSTRUCTIONS_WEIGHT;
+  const destination = getDestinationChainLocation(destinationChainInfo);
+  const beneficiary = getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress);
+  const tokenLocation = getTokenLocation(value);
   let method = 'limitedReserveTransferAssets';
   if (['statemint', 'statemine'].includes(destinationChainInfo.slug)) {
     method = 'limitedTeleportAssets';