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

Fix redeemables (#1358)

Browse Source
This commit is contained in:
Jaco Greeff
2019-09-02 17:58:36 +02:00
committed by GitHub
parent 1968380f89
commit 9ffeda1749
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/src/staking/info.ts
+8 -11
View File
@@ -48,19 +48,14 @@ function remainingBlocks (era: BN, eraLength: BN, bestNumber: BlockNumber): BN {
: remaining;
}
// select the Unlockchunks that can't be redeemed yet
function calcChunks (stakingLedger: StakingLedger, eraLength: BN, bestNumber: BlockNumber): UnlockChunk[] {
return stakingLedger.unlocking.filter((chunk): boolean =>
remainingBlocks(chunk.era.unwrap(), eraLength, bestNumber).gtn(0)
);
}
function calculateUnlocking (stakingLedger: StakingLedger | undefined, eraLength: BN, bestNumber: BlockNumber): DerivedUnlocking | undefined {
if (isUndefined(stakingLedger)) {
return undefined;
}
const unlockingChunks = calcChunks(stakingLedger, eraLength, bestNumber);
const unlockingChunks = stakingLedger.unlocking.filter(({ era }): boolean =>
remainingBlocks(era.unwrap(), eraLength, bestNumber).gtn(0)
);
if (!unlockingChunks.length) {
return undefined;
@@ -81,9 +76,11 @@ function redeemableSum (stakingLedger: StakingLedger | undefined, eraLength: BN,
return new BN(0);
}
return calcChunks(stakingLedger, eraLength, bestNumber).reduce((curr, prev): BN =>
curr.add(prev.value.unwrap()), new BN(0)
);
return stakingLedger.unlocking.reduce((total, { era, value }): BN => {
return remainingBlocks(era.unwrap(), eraLength, bestNumber).eqn(0)
? total.add(value.unwrap())
: total;
}, new BN(0));
}
function unwrapSessionIds (stashId: AccountId, queuedKeys: Option<AccountId> | Vec<[AccountId, Keys] & Codec>, nextKeys: Option<Keys>): { nextSessionIds: AccountId[]; nextSessionId?: AccountId; sessionIds: AccountId[]; sessionId?: AccountId } {