diff --git a/src/services/accounts/AccountsStakingPayoutsService.spec.ts b/src/services/accounts/AccountsStakingPayoutsService.spec.ts index 6aaab6caa..40cb47235 100644 --- a/src/services/accounts/AccountsStakingPayoutsService.spec.ts +++ b/src/services/accounts/AccountsStakingPayoutsService.spec.ts @@ -30,6 +30,7 @@ import { erasValidatorPrefsAt, erasValidatorRewardAt, ledgerAt, + palletVersionAt, } from '../test-helpers/mock/accounts'; import { AccountsStakingPayoutsService } from './AccountsStakingPayoutsService'; @@ -59,6 +60,7 @@ const mockHistoricApi = { erasStakersClipped: { entries: erasStakersClippedAt, }, + palletVersion: palletVersionAt, }, }, } as unknown as ApiDecoration<'promise'>; diff --git a/src/services/accounts/AccountsStakingPayoutsService.ts b/src/services/accounts/AccountsStakingPayoutsService.ts index c05260ac0..ff9498e05 100644 --- a/src/services/accounts/AccountsStakingPayoutsService.ts +++ b/src/services/accounts/AccountsStakingPayoutsService.ts @@ -513,9 +513,20 @@ export class AccountsStakingPayoutsService extends AbstractService { return { commission, }; + } else { + validatorLedger = validatorLedgerOption.unwrap(); + if ( + historicApi.query.staking.claimedRewards && + (await historicApi.query.staking.claimedRewards(era, validatorControllerOption.unwrap())).length === + (await historicApi.query.staking.erasStakersOverview(era, validatorControllerOption.unwrap())) + .unwrap() + .pageCount.toNumber() + ) { + const eraVal: u32 = historicApi.registry.createType('u32', era); + validatorLedger.legacyClaimedRewards.push(eraVal); + } } - validatorLedger = validatorLedgerOption.unwrap(); validatorLedgerCache[validatorId] = validatorLedger; } diff --git a/src/services/test-helpers/mock/accounts/stakingPayouts.ts b/src/services/test-helpers/mock/accounts/stakingPayouts.ts index 85373c8b5..714a1fae0 100644 --- a/src/services/test-helpers/mock/accounts/stakingPayouts.ts +++ b/src/services/test-helpers/mock/accounts/stakingPayouts.ts @@ -83,6 +83,8 @@ export const erasRewardPointsAt = (_: EraIndex) => ), ); +export const palletVersionAt = () => Promise.resolve().then(() => api.registry.createType('u16', '13')); + export const deriveEraExposureParam = { era: api.registry.createType('EraIndex', ERA), nominators: {