quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add isClaimed field to api.derive.staking._stakerRewards (#6007)

Browse Source 
* Add isClaimed field to `api.derive.staking._stakerRewards`

* Fix isClaimed: false
This commit is contained in:
Tarik Gul
2024-10-24 04:36:22 +03:00
committed by GitHub
parent 9d9a99e71e
commit da100e80f2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/src/staking/stakerRewards.ts
+4 -2
View File
@@ -29,7 +29,7 @@ function extractCompatRewards (claimedRewardsEras: Vec<u32>, ledger?: PalletStak
return claimedRewardsEras.toArray().concat(l);
}
function parseRewards (api: DeriveApi, stashId: AccountId, [erasPoints, erasPrefs, erasRewards]: ErasResult, exposures: DeriveStakerExposure[]): DeriveStakerReward[] {
function parseRewards (api: DeriveApi, stashId: AccountId, [erasPoints, erasPrefs, erasRewards]: ErasResult, exposures: DeriveStakerExposure[], claimedRewardsEras: Vec<u32>): DeriveStakerReward[] {
return exposures.map(({ era, isEmpty, isValidator, nominating, validators: eraValidators }): DeriveStakerReward => {
const { eraPoints, validators: allValPoints } = erasPoints.find((p) => p.era.eq(era)) || { eraPoints: BN_ZERO, validators: {} as DeriveEraValPoints };
const { eraReward } = erasRewards.find((r) => r.era.eq(era)) || { eraReward: api.registry.createType('Balance') };
@@ -84,6 +84,7 @@ function parseRewards (api: DeriveApi, stashId: AccountId, [erasPoints, erasPref
return {
era,
eraReward,
isClaimed: claimedRewardsEras.some((c) => c.eq(era)),
isEmpty,
isValidator,
nominating,
@@ -152,6 +153,7 @@ function filterRewards (eras: EraIndex[], valInfo: [string, DeriveStakingQuery][
.filter(({ validators }) => Object.keys(validators).length !== 0)
.map((reward) =>
objectSpread({}, reward, {
isClaimed: filter.some((f) => reward.era.eq(f)),
nominators: reward.nominating.filter((n) => reward.validators[n.validatorId])
})
);
@@ -182,7 +184,7 @@ export function _stakerRewards (instanceId: string, api: DeriveApi): (accountIds
const allRewards = queries.map(({ claimedRewardsEras, stakingLedger, stashId }, index): DeriveStakerReward[] =>
(!stashId || (!stakingLedger && !claimedRewardsEras))
? []
: parseRewards(api, stashId, erasResult, exposures[index])
: parseRewards(api, stashId, erasResult, exposures[index], claimedRewardsEras)
);
if (withActive) {
packages/api-derive/src/staking/types.ts
+1
View File
@@ -93,6 +93,7 @@ export interface DeriveStakerRewardValidator {
export interface DeriveStakerReward {
era: EraIndex;
eraReward: Balance;
isClaimed: boolean;
isEmpty: boolean;
isValidator: boolean;
nominating: DeriveEraExposureNominating[];