From d983ee106c5cd6f43bb925eaee186c7449996f3e Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 23 Apr 2020 11:39:39 +0200 Subject: [PATCH] migrateEra is first stakerPayouts era (#2202) --- packages/api-derive/src/staking/stakerRewards.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/api-derive/src/staking/stakerRewards.ts b/packages/api-derive/src/staking/stakerRewards.ts index f4e6af2c8a..4d45e612f2 100644 --- a/packages/api-derive/src/staking/stakerRewards.ts +++ b/packages/api-derive/src/staking/stakerRewards.ts @@ -107,18 +107,18 @@ function filterRewards (api: ApiInterfaceRx, rewards: DeriveStakerReward[], stak return combineLatest([ api.query.staking.migrateEra ? api.query.staking.migrateEra>() - : of({ unwrapOr: () => api.tx.staking.payoutStakers ? MIN_ONE : MAX_ERAS }), + : of({ unwrapOr: () => api.tx.staking.payoutStakers ? ZERO : MAX_ERAS }), api.tx.staking.payoutStakers ? api.derive.staking.queryMulti(validators) : of([]) ]).pipe( map(([optMigrate, queryValidators]): DeriveStakerReward[] => { - const migrateEra: BN = optMigrate.unwrapOr(MIN_ONE); + const migrateEra: BN = optMigrate.unwrapOr(ZERO); return rewards .filter(({ isEmpty }) => !isEmpty) .filter((reward): boolean => { - if (reward.era.lte(migrateEra)) { + if (reward.era.lt(migrateEra)) { // we filter again here, the actual ledger may have changed, e.g. something has been claimed return filterEra(reward.era, stakingLedger); }