@subwallet/extension-base 1.0.6-2 → 1.0.7-1

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

@@ -34,7 +34,7 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (nominatorMetadata.unstakings.length > 0) {
+    if (nominatorMetadata.unstakings.length > 0 && bnCurrentActiveStake.isZero()) {
       errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
     }
   }
@@ -66,6 +66,35 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
   }
   return errors;
 }
+export function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, callback) {
+  return substrateApi.api.query.staking.currentEra(async _currentEra => {
+    var _substrateApi$api$que, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+    const currentEra = _currentEra.toString();
+    const maxNominations = substrateApi.api.consts.staking.maxNominations.toString();
+    const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
+    const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
+    const [_minNominatorBond, _minPoolJoin, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.minNominatorBond(), (_substrateApi$api$que = substrateApi.api.query) === null || _substrateApi$api$que === void 0 ? void 0 : (_substrateApi$api$que2 = _substrateApi$api$que.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.minJoinBond(), ((_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.staking) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minimumActiveStake) && ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.staking) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.minimumActiveStake())]);
+    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 minPoolJoin = (_minPoolJoin === null || _minPoolJoin === void 0 ? void 0 : _minPoolJoin.toString()) || undefined;
+    const unlockingPeriod = parseInt(unlockingEras) * (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default); // in hours
+
+    callback(chainInfo.slug, {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      era: parseInt(currentEra),
+      minStake: minStake.toString(),
+      maxValidatorPerNominator: parseInt(maxNominations),
+      maxWithdrawalRequestPerValidator: parseInt(maxUnlockingChunks),
+      allowCancelUnstaking: true,
+      unstakingPeriod: unlockingPeriod,
+      minJoinNominationPool: minPoolJoin
+    });
+  });
+}
 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;
@@ -77,16 +106,17 @@ export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   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;
+  let allCurrentNominators = [];
   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);
-      }
+    allCurrentNominators = allCurrentNominators.concat(eraNominators);
+  }
+  for (const nominator of allCurrentNominators) {
+    if (!nominatorList.includes(nominator.who)) {
+      nominatorList.push(nominator.who);
     }
   }
   const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
@@ -120,14 +150,98 @@ export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     nominatorCount: nominatorList.length
   };
 }
+export async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrateApi, ledger) {
+  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$;
+  const chain = chainInfo.slug;
+  const chainApi = await substrateApi.isReady;
+  const [_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$.nominators(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$.currentEra(), (_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$.bonded(address), ((_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$.minimumActiveStake) && ((_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$.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 _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const nominations = _nominations.toPrimitive();
+  const currentEra = _currentEra.toString();
+  const bonded = _bonded.toHuman();
+  const activeStake = ledger.active.toString();
+  const nominationList = [];
+  const unstakingList = [];
+  if (nominations) {
+    const validatorList = nominations.targets;
+    await Promise.all(validatorList.map(async validatorAddress => {
+      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.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 address in top nominators
+        nominationStatus = StakingStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        chain,
+        validatorAddress,
+        status: nominationStatus,
+        validatorIdentity: identity,
+        activeStake: '0' // relaychain allocates stake accordingly
+      });
+    }));
+  }
+
+  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;
+    }
+  }
+  ledger.unlocking.forEach(unlockingChunk => {
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
+    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
+    unstakingList.push({
+      chain,
+      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+      claimable: unlockingChunk.value.toString(),
+      waitingTime: waitingTime > 0 ? waitingTime : 0
+    });
+  });
+  return {
+    chain,
+    type: StakingType.NOMINATED,
+    status: stakingStatus,
+    address: address,
+    activeStake,
+    nominations: nominationList,
+    unstakings: unstakingList,
+    isBondedBefore: bonded !== null
+  };
+}
 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;
+  var _chainApi$api$query10, _chainApi$api$query11, _chainApi$api$query12, _chainApi$api$query13, _chainApi$api$query14, _chainApi$api$query15, _chainApi$api$query16, _chainApi$api$query17, _chainApi$api$query18, _chainApi$api$query19, _chainApi$api$query20, _chainApi$api$query21, _chainApi$api$query22, _chainApi$api$query23;
   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 [_ledger, _nominations, _currentEra, _bonded, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_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.ledger(address), (_chainApi$api$query12 = chainApi.api.query) === null || _chainApi$api$query12 === void 0 ? void 0 : (_chainApi$api$query13 = _chainApi$api$query12.staking) === null || _chainApi$api$query13 === void 0 ? void 0 : _chainApi$api$query13.nominators(address), (_chainApi$api$query14 = chainApi.api.query) === null || _chainApi$api$query14 === void 0 ? void 0 : (_chainApi$api$query15 = _chainApi$api$query14.staking) === null || _chainApi$api$query15 === void 0 ? void 0 : _chainApi$api$query15.currentEra(), (_chainApi$api$query16 = chainApi.api.query) === null || _chainApi$api$query16 === void 0 ? void 0 : (_chainApi$api$query17 = _chainApi$api$query16.staking) === null || _chainApi$api$query17 === void 0 ? void 0 : _chainApi$api$query17.bonded(address), ((_chainApi$api$query18 = chainApi.api.query) === null || _chainApi$api$query18 === void 0 ? void 0 : (_chainApi$api$query19 = _chainApi$api$query18.staking) === null || _chainApi$api$query19 === void 0 ? void 0 : _chainApi$api$query19.minimumActiveStake) && ((_chainApi$api$query20 = chainApi.api.query) === null || _chainApi$api$query20 === void 0 ? void 0 : (_chainApi$api$query21 = _chainApi$api$query20.staking) === null || _chainApi$api$query21 === void 0 ? void 0 : _chainApi$api$query21.minimumActiveStake()), (_chainApi$api$query22 = chainApi.api.query) === null || _chainApi$api$query22 === void 0 ? void 0 : (_chainApi$api$query23 = _chainApi$api$query22.staking) === null || _chainApi$api$query23 === void 0 ? void 0 : _chainApi$api$query23.minNominatorBond()]);
   const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
   const minNominatorBond = _minNominatorBond.toString();
   const bnMinActiveStake = new BN(minActiveStake);
@@ -219,6 +333,67 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     isBondedBefore: bonded !== null
   };
 }
+export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substrateApi, poolMemberInfo) {
+  const _maxNominatorRewardedPerValidator = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
+  const poolStashAccount = parsePoolStashAddress(substrateApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
+  const [_nominations, _poolMetadata, _currentEra] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.metadata(poolMemberInfo.poolId), substrateApi.api.query.staking.currentEra()]);
+  const poolMetadata = _poolMetadata.toPrimitive();
+  const currentEra = _currentEra.toString();
+  const nominations = _nominations.toJSON();
+  let stakingStatus = StakingStatus.NOT_EARNING;
+  const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  if (nominations) {
+    const validatorList = nominations.targets;
+    await Promise.all(validatorList.map(async validatorAddress => {
+      const _eraStaker = await substrateApi.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
+    hasUnstaking: poolMemberInfo.unbondingEras && Object.keys(poolMemberInfo.unbondingEras).length > 0
+  };
+  const unstakings = [];
+  Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
+    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+    unstakings.push({
+      chain: chainInfo.slug,
+      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+      claimable: amount.toString(),
+      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,
+    address,
+    status: stakingStatus,
+    activeStake: poolMemberInfo.points.toString(),
+    nominations: [joinedPoolInfo],
+    // can only join 1 pool at a time
+    unstakings
+  };
+}
 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()]);
@@ -345,9 +520,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$query24, _chainApi$api$query25, _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$query24 = chainApi.api.query) === null || _chainApi$api$query24 === void 0 ? void 0 : (_chainApi$api$query25 = _chainApi$api$query24.identity) === null || _chainApi$api$query25 === void 0 ? void 0 : _chainApi$api$query25.identityOf(address)]);
     const commissionInfo = _commissionInfo.toHuman();
     const identityInfo = _identityInfo ? _identityInfo.toHuman() : null;
     let identity;

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

@@ -1,6 +1,6 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { StakingItem, StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
+import { NominatorMetadata, StakingItem, StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export declare function stakingOnChainApi(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, callback: (networkKey: string, rs: StakingItem) => void, chainInfoMap: Record<string, _ChainInfo>): () => void;
-export declare function getNominationStakingRewardData(addresses: string[], chainInfoMap: Record<string, _ChainInfo>): Promise<StakingRewardItem[]>;
-export declare function getPoolingStakingRewardData(addresses: string[], networkMap: Record<string, _ChainInfo>, dotSamaApiMap: Record<string, _SubstrateApi>): Promise<StakingRewardItem[]>;
+export declare function stakingOnChainApi(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, chainInfoMap: Record<string, _ChainInfo>, stakingCallback: (networkKey: string, rs: StakingItem) => void, nominatorStateCallback: (nominatorMetadata: NominatorMetadata) => void): () => void;
+export declare function getNominationStakingRewardData(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, callback: (rewardItem: StakingRewardItem) => void): Promise<void>;
+export declare function getPoolingStakingRewardData(addresses: string[], networkMap: Record<string, _ChainInfo>, dotSamaApiMap: Record<string, _SubstrateApi>, callback: (rs: StakingRewardItem) => void): Promise<void>;

package/koni/api/staking/index.js

@@ -7,7 +7,7 @@ import { getAllSubsquidStaking } from '@subwallet/extension-base/koni/api/stakin
 import { _PURE_EVM_CHAINS, _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses } from '@subwallet/extension-base/utils';
-export function stakingOnChainApi(addresses, substrateApiMap, callback, chainInfoMap) {
+export function stakingOnChainApi(addresses, substrateApiMap, chainInfoMap, stakingCallback, nominatorStateCallback) {
   const filteredApiMap = [];
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);
   Object.entries(chainInfoMap).forEach(([networkKey, chainInfo]) => {
@@ -28,20 +28,20 @@ export function stakingOnChainApi(addresses, substrateApiMap, callback, chainInf
     const parentApi = await apiPromise.isReady;
     const useAddresses = _isChainEvmCompatible(chainInfoMap[chain]) ? evmAddresses : substrateAddresses;
     if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
-      const unsub = await getAmplitudeStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, callback);
+      const unsub = await getAmplitudeStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback);
       unsubList.push(unsub);
     } else if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
-      const unsub = await getAstarStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, callback);
+      const unsub = await getAstarStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback);
       unsubList.push(unsub);
     } else if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
-      const unsub = await getParaStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, callback);
+      const unsub = await getParaStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback);
       unsubList.push(unsub);
     } else if (_STAKING_CHAIN_GROUP.relay.includes(chain)) {
-      const unsub = await getRelayStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, callback);
+      const unsub = await getRelayStakingOnChain(parentApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback);
       unsubList.push(unsub);
     }
     if (_STAKING_CHAIN_GROUP.nominationPool.includes(chain)) {
-      const unsub = await getRelayPoolingOnChain(parentApi, useAddresses, chainInfoMap, chain, callback);
+      const unsub = await getRelayPoolingOnChain(parentApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback);
       unsubList.push(unsub);
     }
   });
@@ -51,11 +51,11 @@ export function stakingOnChainApi(addresses, substrateApiMap, callback, chainInf
     });
   };
 }
-export async function getNominationStakingRewardData(addresses, chainInfoMap) {
+export async function getNominationStakingRewardData(addresses, chainInfoMap, callback) {
   // might retrieve from other sources
-  return await getAllSubsquidStaking(addresses, chainInfoMap);
+  await getAllSubsquidStaking(addresses, chainInfoMap, callback);
 }
-export async function getPoolingStakingRewardData(addresses, networkMap, dotSamaApiMap) {
+export async function getPoolingStakingRewardData(addresses, networkMap, dotSamaApiMap, callback) {
   const activeNetworks = [];
   Object.entries(networkMap).forEach(([key, chainInfo]) => {
     if (_isChainSupportSubstrateStaking(chainInfo) && _isSubstrateRelayChain(chainInfo)) {
@@ -63,7 +63,7 @@ export async function getPoolingStakingRewardData(addresses, networkMap, dotSama
     }
   });
   if (activeNetworks.length === 0) {
-    return [];
+    return;
   }
-  return getNominationPoolReward(addresses, networkMap, dotSamaApiMap);
+  await getNominationPoolReward(addresses, networkMap, dotSamaApiMap, callback);
 }

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

@@ -1,7 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { StakingItem, StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
+import { NominatorMetadata, StakingItem, StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-export declare function getAmplitudeStakingOnChain(parentApi: _SubstrateApi, useAddresses: string[], networks: Record<string, _ChainInfo>, chain: string, callback: (networkKey: string, rs: StakingItem) => void): import("@polkadot/api-base/types").UnsubscribePromise;
-export declare function getAmplitudeUnclaimedStakingReward(substrateApiMap: Record<string, _SubstrateApi>, addresses: string[], networks: Record<string, _ChainInfo>, chains: string[]): Promise<StakingRewardItem[]>;
-export declare function getParaStakingOnChain(parentApi: _SubstrateApi, useAddresses: string[], networks: Record<string, _ChainInfo>, chain: string, callback: (networkKey: string, rs: StakingItem) => void): import("@polkadot/api-base/types").UnsubscribePromise;
-export declare function getAstarStakingOnChain(parentApi: _SubstrateApi, useAddresses: string[], networks: Record<string, _ChainInfo>, chain: string, callback: (networkKey: string, rs: StakingItem) => void): import("@polkadot/api-base/types").UnsubscribePromise;
+export declare function getAmplitudeStakingOnChain(parentApi: _SubstrateApi, useAddresses: string[], networks: Record<string, _ChainInfo>, chain: string, callback: (networkKey: string, rs: StakingItem) => void, nominatorStateCallback: (nominatorMetadata: NominatorMetadata) => void): import("@polkadot/api-base/types").UnsubscribePromise;
+export declare function getAmplitudeUnclaimedStakingReward(substrateApiMap: Record<string, _SubstrateApi>, addresses: string[], networks: Record<string, _ChainInfo>, chains: string[], callBack: (rs: StakingRewardItem) => void): Promise<StakingRewardItem[]>;
+export declare function getParaStakingOnChain(substrateApi: _SubstrateApi, useAddresses: string[], chainInfoMap: Record<string, _ChainInfo>, chain: string, stakingCallback: (networkKey: string, rs: StakingItem) => void, nominatorStateCallback: (nominatorMetadata: NominatorMetadata) => void): import("@polkadot/api-base/types").UnsubscribePromise;
+export declare function getAstarStakingOnChain(substrateApi: _SubstrateApi, useAddresses: string[], chainInfoMap: Record<string, _ChainInfo>, chain: string, stakingCallback: (networkKey: string, rs: StakingItem) => void, nominatorStateCallback: (nominatorMetadata: NominatorMetadata) => void): import("@polkadot/api-base/types").UnsubscribePromise;