short circuit if delegations isn't active

Fantom-foundation · Nov 18, 2020 · 2736cfe · 2736cfe
1 parent e627a5b
commit 2736cfe
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/contracts/sfc/Staker.sol b/contracts/sfc/Staker.sol
@@ -430,9 +430,7 @@ contract Stakers is Ownable, StakersConstants, Version {
     function _calcDelegationLockupRewards(address delegator, uint256 toStakerID, uint256 fromEpoch, uint256 maxEpochs, bool compound) internal view returns (_RewardsSet memory, uint256, uint256) {
         Delegation memory delegation = delegations[delegator][toStakerID];
         fromEpoch = withDefault(fromEpoch, delegation.paidUntilEpoch + 1);
-        assert(delegation.deactivatedTime == 0);
-
-        if (delegation.paidUntilEpoch >= fromEpoch) {
+        if (delegation.amount == 0 || delegation.deactivatedTime != 0 || delegation.paidUntilEpoch >= fromEpoch) {
             return (_RewardsSet(0, 0, 0, 0), fromEpoch, 0);
         }