@subwallet/extension-base 1.0.1 → 1.0.2-1

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

@@ -1,11 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getFreeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
-import { isUrl, parseNumberToDisplay, parseRawNumber } from '@subwallet/extension-base/utils';
+import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -81,6 +79,8 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
+          status: StakingStatus.NOT_EARNING,
+          // TODO
           chain,
           validatorAddress: dappAddress,
           activeStake: currentStake,
@@ -115,9 +115,11 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
     address: address,
     activeStake: bnTotalActiveStake.toString(),
     nominations: nominationList,
-    unstakings: unstakingList
+    unstakings: unstakingList,
+    status: StakingStatus.NOT_EARNING // TODO
   };
 }
+
 export async function getAstarDappsInfo(networkKey, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
@@ -137,21 +139,26 @@ export async function getAstarDappsInfo(networkKey, substrateApi) {
     const dappName = dapp.name;
     const dappAddress = dapp.address;
     const dappIcon = isUrl(dapp.iconUrl) ? dapp.iconUrl : undefined;
-    const _contractInfo = await chainApi.api.query.dappsStaking.contractEraStake({
+    const contractParam = isEthereumAddress(dappAddress) ? {
       Evm: dappAddress
-    }, era);
-    const contractInfo = _contractInfo.toHuman();
-    let totalStake = 0;
+    } : {
+      Wasm: dappAddress
+    };
+    const _contractInfo = await chainApi.api.query.dappsStaking.contractEraStake(contractParam, era);
+    const contractInfo = _contractInfo.toPrimitive();
+    let totalStake = '0';
     let stakerCount = 0;
     if (contractInfo !== null) {
-      totalStake = parseRawNumber(contractInfo.total);
-      stakerCount = parseRawNumber(contractInfo.numberOfStakers);
+      var _contractInfo$total;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      totalStake = contractInfo === null || contractInfo === void 0 ? void 0 : (_contractInfo$total = contractInfo.total) === null || _contractInfo$total === void 0 ? void 0 : _contractInfo$total.toString();
+      stakerCount = contractInfo.numberOfStakers;
     }
     allDappsInfo.push({
       commission: 0,
       expectedReturn: 0,
       address: dappAddress,
-      totalStake: totalStake.toString(),
+      totalStake: totalStake,
       ownStake: '0',
       otherStake: totalStake.toString(),
       nominatorCount: stakerCount,
@@ -166,172 +173,31 @@ export async function getAstarDappsInfo(networkKey, substrateApi) {
   }));
   return allDappsInfo;
 }
-export async function getAstarBondingTxInfo(chainInfo, substrateApi, stakerAddress, amount, dappInfo) {
-  const apiPromise = await substrateApi.isReady;
-  const {
-    decimals
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  const parsedAmount = amount * 10 ** decimals;
-  const binaryAmount = new BN(parsedAmount.toString());
-  const extrinsic = apiPromise.api.tx.dappsStaking.bondAndStake({
-    Evm: dappInfo.address
-  }, binaryAmount);
-  return extrinsic.paymentInfo(stakerAddress);
-}
-export async function handleAstarBondingTxInfo(chainInfo, amount, networkKey, stakerAddress, dappInfo, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarBondingTxInfo(chainInfo, substrateApiMap[networkKey], stakerAddress, amount, dappInfo), getFreeBalance(networkKey, stakerAddress, substrateApiMap, evmApiMap)]);
-    const feeString = parseNumberToDisplay(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = parseRawNumber(txInfo.partialFee.toString());
-    const binaryBalance = new BN(balance);
-    const sumAmount = txInfo.partialFee.addn(amount);
-    const balanceError = sumAmount.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
-    };
-  }
-}
 export async function getAstarBondingExtrinsic(substrateApi, amount, dappInfo) {
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new BN(amount);
-  return chainApi.api.tx.dappsStaking.bondAndStake({
+  const dappParam = isEthereumAddress(dappInfo.address) ? {
     Evm: dappInfo.address
-  }, binaryAmount);
-}
-export async function getAstarUnbondingTxInfo(chainInfo, substrateApi, stakerAddress, amount, dappAddress) {
-  const apiPromise = await substrateApi.isReady;
-  const {
-    decimals
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  const parsedAmount = amount * 10 ** decimals;
-  const binaryAmount = new BN(parsedAmount.toString());
-  const extrinsic = apiPromise.api.tx.dappsStaking.unbondAndUnstake({
-    Evm: dappAddress
-  }, binaryAmount);
-  return extrinsic.paymentInfo(stakerAddress);
-}
-export async function handleAstarUnbondingTxInfo(chainInfo, amount, networkKey, stakerAddress, dappAddress, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarUnbondingTxInfo(chainInfo, substrateApiMap[networkKey], stakerAddress, amount, dappAddress), getFreeBalance(networkKey, stakerAddress, substrateApiMap, evmApiMap)]);
-    const feeString = parseNumberToDisplay(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = parseRawNumber(txInfo.partialFee.toString());
-    const binaryBalance = new BN(balance);
-    const balanceError = txInfo.partialFee.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
-    };
-  }
+  } : {
+    Wasm: dappInfo.address
+  };
+  return chainApi.api.tx.dappsStaking.bondAndStake(dappParam, binaryAmount);
 }
 export async function getAstarUnbondingExtrinsic(substrateApi, amount, dappAddress) {
   const apiPromise = await substrateApi.isReady;
   const binaryAmount = new BN(amount);
-  return apiPromise.api.tx.dappsStaking.unbondAndUnstake({
+  const dappParam = isEthereumAddress(dappAddress) ? {
     Evm: dappAddress
-  }, binaryAmount);
-}
-async function getAstarUnlockingInfo(substrateApi, address, networkKey) {
-  const chainApi = await substrateApi.isReady;
-  const [_stakingInfo, _era] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra()]);
-  const currentEra = parseRawNumber(_era.toHuman());
-  const stakingInfo = _stakingInfo.toHuman();
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  const unlockingChunks = stakingInfo.unbondingInfo.unlockingChunks;
-  let nextWithdrawalEra = -1;
-  let nextWithdrawalAmount = 0;
-  let redeemable = 0;
-  for (const chunk of unlockingChunks) {
-    const unlockEra = parseRawNumber(chunk.unlockEra);
-    const amount = parseRawNumber(chunk.amount);
-
-    // Find next withdrawal
-    if (nextWithdrawalEra === -1) {
-      nextWithdrawalEra = unlockEra;
-      nextWithdrawalAmount = amount;
-    } else if (unlockEra <= nextWithdrawalEra) {
-      nextWithdrawalEra = unlockEra;
-      nextWithdrawalAmount += amount;
-    }
-
-    // Find redeemable
-    if (unlockEra - currentEra <= 0) {
-      redeemable += amount;
-    }
-  }
-  const nextWithdrawal = (nextWithdrawalEra - currentEra) * _STAKING_ERA_LENGTH_MAP[networkKey];
-  return {
-    nextWithdrawal,
-    nextWithdrawalAmount,
-    redeemable
-  };
-}
-export async function handleAstarUnlockingInfo(substrateApi, chainInfo, networkKey, address, type) {
-  const {
-    nextWithdrawal,
-    nextWithdrawalAmount,
-    redeemable
-  } = await getAstarUnlockingInfo(substrateApi, address, networkKey);
-  const {
-    decimals
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  const parsedRedeemable = redeemable / 10 ** decimals;
-  const parsedNextWithdrawalAmount = nextWithdrawalAmount / 10 ** decimals;
-  return {
-    address,
-    type,
-    chain: networkKey,
-    nextWithdrawal: nextWithdrawal,
-    redeemable: parsedRedeemable,
-    nextWithdrawalAmount: parsedNextWithdrawalAmount
-  };
-}
-export async function getAstarWithdrawalTxInfo(substrateApi, address) {
-  const apiPromise = await substrateApi.isReady;
-  const extrinsic = apiPromise.api.tx.dappsStaking.withdrawUnbonded();
-  return extrinsic.paymentInfo(address);
-}
-export async function handleAstarWithdrawalTxInfo(networkKey, chainInfo, substrateApiMap, evmApiMap, address) {
-  const [txInfo, balance] = await Promise.all([getAstarWithdrawalTxInfo(substrateApiMap[networkKey], address), getFreeBalance(networkKey, address, substrateApiMap, evmApiMap)]);
-  const {
-    decimals,
-    symbol
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  const feeString = parseNumberToDisplay(txInfo.partialFee, decimals) + ` ${symbol}`;
-  const rawFee = parseRawNumber(txInfo.partialFee.toString());
-  const binaryBalance = new BN(balance);
-  const balanceError = txInfo.partialFee.gt(binaryBalance);
-  return {
-    rawFee,
-    fee: feeString,
-    balanceError
+  } : {
+    Wasm: dappAddress
   };
+  return apiPromise.api.tx.dappsStaking.unbondAndUnstake(dappParam, binaryAmount);
 }
 export async function getAstarWithdrawalExtrinsic(substrateApi) {
   const chainApi = await substrateApi.isReady;
   return chainApi.api.tx.dappsStaking.withdrawUnbonded();
 }
-export async function getAstarClaimRewardTxInfo(substrateApi, address) {
+export 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 = parseRawNumber(_currentEra.toHuman());
@@ -343,6 +209,7 @@ export async function getAstarClaimRewardTxInfo(substrateApi, address) {
     const stakes = stakeData.stakes;
     const dappAddress = stakedDapp.Evm.toLowerCase();
     let numberOfUnclaimedEra = 0;
+    const maxTx = 50;
     for (let i = 0; i < stakes.length; i++) {
       var _stakes;
       const {
@@ -360,74 +227,13 @@ export async function getAstarClaimRewardTxInfo(substrateApi, address) {
       const eraToClaim = isLastEra ? currentEra - parsedEra : nextEra - parsedEra;
       numberOfUnclaimedEra += eraToClaim;
     }
-    for (let i = 0; i < numberOfUnclaimedEra; i++) {
-      const tx = apiPromise.api.tx.dappsStaking.claimStaker({
-        Evm: dappAddress
-      });
-      transactions.push(tx);
-    }
-  }
-  console.log('no of tx: ', transactions.length);
-  const extrinsic = apiPromise.api.tx.utility.batch(transactions);
-  return extrinsic.paymentInfo(address);
-}
-export async function handleAstarClaimRewardTxInfo(address, networkKey, chainInfo, substrateApiMap, evmApiMap) {
-  const {
-    decimals,
-    symbol
-  } = _getChainNativeTokenBasicInfo(chainInfo);
-  try {
-    const [txInfo, balance] = await Promise.all([getAstarClaimRewardTxInfo(substrateApiMap[networkKey], address), getFreeBalance(networkKey, address, substrateApiMap, evmApiMap)]);
-    const feeString = parseNumberToDisplay(txInfo.partialFee, decimals) + ` ${symbol}`;
-    const rawFee = parseRawNumber(txInfo.partialFee.toString());
-    const binaryBalance = new BN(balance);
-    const balanceError = txInfo.partialFee.gt(binaryBalance);
-    return {
-      rawFee,
-      fee: feeString,
-      balanceError
-    };
-  } catch (e) {
-    return {
-      fee: `0.0000 ${symbol}`,
-      balanceError: false
+    const dappParam = isEthereumAddress(dappAddress) ? {
+      Evm: dappAddress
+    } : {
+      Wasm: dappAddress
     };
-  }
-}
-export 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 = parseRawNumber(_currentEra.toHuman());
-  const transactions = [];
-  for (const item of _stakedDapps) {
-    const data = item[0].toHuman();
-    const stakedDapp = data[1];
-    const stakeData = item[1].toHuman();
-    const stakes = stakeData.stakes;
-    const dappAddress = stakedDapp.Evm.toLowerCase();
-    let numberOfUnclaimedEra = 0;
-    const maxTx = 50;
-    for (let i = 0; i < stakes.length; i++) {
-      var _stakes2;
-      const {
-        era,
-        staked
-      } = stakes[i];
-      const bnStaked = new BN(staked.replaceAll(',', ''));
-      const parsedEra = parseRawNumber(era);
-      if (bnStaked.eq(new BN(0))) {
-        continue;
-      }
-      const nextEraData = (_stakes2 = stakes[i + 1]) !== null && _stakes2 !== void 0 ? _stakes2 : null;
-      const nextEra = nextEraData && parseRawNumber(nextEraData.era);
-      const isLastEra = i === stakes.length - 1;
-      const eraToClaim = isLastEra ? currentEra - parsedEra : nextEra - parsedEra;
-      numberOfUnclaimedEra += eraToClaim;
-    }
     for (let i = 0; i < Math.min(numberOfUnclaimedEra, maxTx); i++) {
-      const tx = apiPromise.api.tx.dappsStaking.claimStaker({
-        Evm: dappAddress
-      });
+      const tx = apiPromise.api.tx.dappsStaking.claimStaker(dappParam);
       transactions.push(tx);
     }
   }

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

@@ -5,7 +5,7 @@ export declare function getChainStakingMetadata(chain: string, substrateApi: _Su
 export declare function getNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getValidatorsInfo(networkKey: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
 export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("@subwallet/extension-base/background/KoniTypes").NominationPoolInfo[]>;
-export declare function getBondingExtrinsic(chainInfo: _ChainInfo, amount: string, nominatorMetadata: NominatorMetadata, selectedValidators: ValidatorInfo[], substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getBondingExtrinsic(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], substrateApi: _SubstrateApi, address: string, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getUnbondingExtrinsic(nominatorMetadata: NominatorMetadata, amount: string, chain: string, substrateApi: _SubstrateApi, selectedValidator?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getWithdrawalExtrinsic(substrateApi: _SubstrateApi, chain: string, nominatorMetadata: NominatorMetadata, validatorAddress?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getClaimRewardExtrinsic(substrateApi: _SubstrateApi, chain: string, address: string, stakingType: StakingType, bondReward?: boolean): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -42,15 +42,15 @@ export async function getValidatorsInfo(networkKey, substrateApi, decimals, chai
 export async function getNominationPoolsInfo(chain, substrateApi) {
   return getRelayPoolsInfo(chain, substrateApi);
 }
-export async function getBondingExtrinsic(chainInfo, amount, nominatorMetadata, selectedValidators, substrateApi) {
+export async function getBondingExtrinsic(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata) {
   if (_STAKING_CHAIN_GROUP.para.includes(chainInfo.slug)) {
-    return getParaBondingExtrinsic(nominatorMetadata, chainInfo, substrateApi, amount, selectedValidators[0]); // only select 1 validator at a time
+    return getParaBondingExtrinsic(chainInfo, substrateApi, amount, selectedValidators[0], nominatorMetadata); // only select 1 validator at a time
   } else if (_STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return getAstarBondingExtrinsic(substrateApi, amount, selectedValidators[0]);
   } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chainInfo.slug)) {
-    return getAmplitudeBondingExtrinsic(nominatorMetadata, substrateApi, amount, selectedValidators[0]);
+    return getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidators[0], nominatorMetadata);
   }
-  return getRelayBondingExtrinsic(substrateApi, amount, selectedValidators, nominatorMetadata, chainInfo);
+  return getRelayBondingExtrinsic(substrateApi, amount, selectedValidators, chainInfo, address, nominatorMetadata);
 }
 export async function getUnbondingExtrinsic(nominatorMetadata, amount, chain, substrateApi, selectedValidator) {
   if (_STAKING_CHAIN_GROUP.para.includes(chain)) {

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

@@ -4,7 +4,7 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 export declare function getParaChainStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getParaChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getParachainCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
-export declare function getParaBondingExtrinsic(nominatorMetadata: NominatorMetadata, chainInfo: _ChainInfo, substrateApi: _SubstrateApi, amount: string, selectedCollatorInfo: ValidatorInfo): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getParaBondingExtrinsic(chainInfo: _ChainInfo, substrateApi: _SubstrateApi, amount: string, selectedCollatorInfo: ValidatorInfo, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getParaUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, nominatorMetadata: NominatorMetadata, selectedValidator: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getParaWithdrawalExtrinsic(substrateApi: _SubstrateApi, address: string, collatorAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getTuringCompoundExtrinsic(substrateApi: _SubstrateApi, address: string, collatorAddress: string, accountMinimum: string, bondedAmount: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+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';
@@ -97,6 +97,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
       chain,
+      status: StakingStatus.NOT_EARNING,
       validatorAddress: delegation.owner,
       validatorIdentity: identity,
       activeStake: bnActiveStake.toString(),
@@ -119,15 +120,16 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
 }
 export async function getParachainCollatorsInfo(chain, substrateApi) {
   const apiProps = await substrateApi.isReady;
-  const allValidators = [];
+  const allCollators = [];
   const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
   const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
   const rawCollatorCommission = _collatorCommission.toHuman();
   const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
   for (const collator of _allCollators) {
-    const collatorAddress = collator[0].toPrimitive();
+    const _collatorAddress = collator[0].toHuman();
+    const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
-    allValidators.push({
+    allCollators.push({
       commission: 0,
       expectedReturn: 0,
       address: collatorAddress,
@@ -143,9 +145,9 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     });
   }
   const extraInfoMap = {};
-  await Promise.all(allValidators.map(async validator => {
+  await Promise.all(allCollators.map(async collator => {
     var _apiProps$api$query, _apiProps$api$query$i;
-    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(validator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(validator.address) // some chains might not have identity pallet
+    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(collator.address) // some chains might not have identity pallet
     ]);
     const rawInfo = _info.toHuman();
     const rawIdentity = _identity ? _identity.toHuman() : null;
@@ -161,7 +163,7 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
       isReasonable = rawIdentity.judgements.length > 0;
       identity = parseIdentity(rawIdentity);
     }
-    extraInfoMap[validator.address] = {
+    extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,
       bond: bond.toString(),
@@ -170,7 +172,7 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
       active
     };
   }));
-  for (const validator of allValidators) {
+  for (const validator of allCollators) {
     validator.minBond = extraInfoMap[validator.address].minDelegation.toString();
     validator.ownStake = extraInfoMap[validator.address].bond.toString();
     validator.blocked = !extraInfoMap[validator.address].active;
@@ -181,16 +183,20 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     validator.nominatorCount = extraInfoMap[validator.address].delegationCount;
     validator.commission = collatorCommission;
   }
-  return allValidators;
+  return allCollators;
 }
-export async function getParaBondingExtrinsic(nominatorMetadata, chainInfo, substrateApi, amount, selectedCollatorInfo) {
+export async function getParaBondingExtrinsic(chainInfo, substrateApi, amount, selectedCollatorInfo, nominatorMetadata) {
   const apiPromise = await substrateApi.isReady;
   const binaryAmount = new BN(amount);
+  if (!nominatorMetadata) {
+    return apiPromise.api.tx.parachainStaking.delegate(selectedCollatorInfo.address, binaryAmount, new BN(selectedCollatorInfo.nominatorCount), 0);
+  }
   const {
     bondedValidators,
     nominationCount
   } = getBondedValidators(nominatorMetadata.nominations);
-  if (!bondedValidators.includes(reformatAddress(selectedCollatorInfo.address, 0))) {
+  const parsedSelectedCollatorAddress = reformatAddress(selectedCollatorInfo.address, 0);
+  if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
     return apiPromise.api.tx.parachainStaking.delegate(selectedCollatorInfo.address, binaryAmount, new BN(selectedCollatorInfo.nominatorCount), nominationCount);
   } else {
     return apiPromise.api.tx.parachainStaking.delegatorBondMore(selectedCollatorInfo.address, binaryAmount);

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

@@ -22,7 +22,7 @@ export declare function getRelayChainNominatorMetadata(chainInfo: _ChainInfo, ad
 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[]>;
 export declare function getRelayPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<NominationPoolInfo[]>;
-export declare function getRelayBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, targetValidators: ValidatorInfo[], nominatorMetadata: NominatorMetadata, chainInfo: _ChainInfo, bondDest?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getRelayBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, targetValidators: ValidatorInfo[], chainInfo: _ChainInfo, address: string, nominatorMetadata?: NominatorMetadata, bondDest?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getRelayUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, nominatorMetadata: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getRelayWithdrawalExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getRelayCancelWithdrawalExtrinsic(substrateApi: _SubstrateApi, selectedUnstaking: UnstakingInfo): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -1,9 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateValidatorStakedReturn, getCommission, parseIdentity, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+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 { _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 async function getRelayChainStakingMetadata(chain, substrateApi) {
@@ -48,30 +50,51 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
   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 ledger = _ledger.toJSON();
-  const nominations = _nominations.toJSON();
+  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const ledger = _ledger.toPrimitive();
+  const nominations = _nominations.toPrimitive();
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
     return;
   }
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const activeStake = ledger.active.toString();
   const nominationList = [];
   const unstakingList = [];
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      const identityInfo = (await chainApi.api.query.identity.identityOf(validatorAddress)).toHuman();
+      let nominationStatus = StakingStatus.NOT_EARNING;
+      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const eraStaker = _eraStaker.toPrimitive();
+      const identityInfo = _identityInfo.toHuman();
       const identity = parseIdentity(identityInfo);
+      const topNominators = eraStaker.others.map(nominator => {
+        return nominator.who;
+      });
+      if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
+        // if address in top nominators
+        nominationStatus = StakingStatus.EARNING_REWARD;
+      }
       nominationList.push({
         chain,
         validatorAddress,
+        status: nominationStatus,
         validatorIdentity: identity,
         activeStake: '0' // relaychain allocates stake accordingly
       });
     }));
   }
 
+  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 => {
     const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
     const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
@@ -86,6 +109,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   return {
     chain,
     type: StakingType.NOMINATED,
+    status: stakingStatus,
     address: address,
     activeStake,
     nominations: nominationList,
@@ -96,17 +120,39 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
 export async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const [_poolMemberInfo, _currentEra] = await Promise.all([chainApi.api.query.nominationPools.poolMembers(address), chainApi.api.query.staking.currentEra()]);
+  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const poolsPalletId = chainApi.api.consts.nominationPools.palletId.toString();
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
     return;
   }
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
   const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const poolStashAccount = parsePoolStashAddress(chainApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
+  const _nominations = await chainApi.api.query.staking.nominators(poolStashAccount);
+  const nominations = _nominations.toJSON();
+  if (nominations) {
+    const validatorList = nominations.targets;
+    await Promise.all(validatorList.map(async validatorAddress => {
+      const _eraStaker = await chainApi.api.query.staking.erasStakers(currentEra, validatorAddress);
+      const eraStaker = _eraStaker.toPrimitive();
+      const topNominators = eraStaker.others.map(nominator => {
+        return nominator.who;
+      }).slice(0, maxNominatorRewardedPerValidator);
+      if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
+        // if address in top nominators
+        stakingStatus = StakingStatus.EARNING_REWARD;
+      }
+    }));
+  }
   const joinedPoolInfo = {
     activeStake: poolMemberInfo.points.toString(),
     chain: chainInfo.slug,
+    status: stakingStatus,
     validatorIdentity: poolName,
     validatorAddress: poolMemberInfo.poolId.toString(),
     // use poolId
@@ -128,6 +174,7 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
     chain: chainInfo.slug,
     type: StakingType.POOLED,
     address,
+    status: stakingStatus,
     activeStake: poolMemberInfo.points.toString(),
     nominations: [joinedPoolInfo],
     // can only join 1 pool at a time
@@ -236,22 +283,30 @@ export async function getRelayPoolsInfo(chain, substrateApi) {
   }));
   return nominationPools;
 }
-export async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators, nominatorMetadata, chainInfo, bondDest = 'Staked') {
+export async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators, chainInfo, address, nominatorMetadata, bondDest = 'Staked') {
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new BN(amount);
   let bondTx;
   let nominateTx;
+  const validatorParamList = targetValidators.map(validator => {
+    return validator.address;
+  });
+  if (!nominatorMetadata) {
+    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
+    return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
+  }
   if (!nominatorMetadata.isBondedBefore) {
     // first time
     bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
-    nominateTx = chainApi.api.tx.staking.nominate(targetValidators);
+    nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {
     if (binaryAmount.gt(BN_ZERO)) {
       bondTx = chainApi.api.tx.staking.bondExtra(binaryAmount);
     }
     if (nominatorMetadata.isBondedBefore && targetValidators.length > 0) {
-      nominateTx = chainApi.api.tx.staking.nominate(targetValidators);
+      nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     }
   }
   if (bondTx && !nominateTx) {