Claim rewards during requestWithdraw

stader-labs · Dec 9, 2023 · c6bfcc8 · c6bfcc8
1 parent 450a8e6
commit c6bfcc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/contracts/SDIncentiveController.sol b/contracts/SDIncentiveController.sol
@@ -61,11 +61,8 @@ contract SDIncentiveController is ISDIncentiveController, AccessControlUpgradeab
         updateReward(account);
 
         uint256 reward = rewards[account];
-        if (reward == 0) {
-            revert NoRewardsToClaim();
-        }
         rewards[account] = 0;
-        IERC20(staderConfig.getStaderToken()).transfer(account, reward);
+        if (reward > 0) IERC20(staderConfig.getStaderToken()).transfer(account, reward);
 
         emit RewardClaimed(account, reward);
     }

diff --git a/contracts/SDUtilityPool.sol b/contracts/SDUtilityPool.sol
@@ -770,6 +770,7 @@ contract SDUtilityPool is ISDUtilityPool, AccessControlUpgradeable, PausableUpgr
         if (requestIdsByDelegatorAddress[msg.sender].length + 1 > maxNonRedeemedDelegatorRequestCount) {
             revert MaxLimitOnWithdrawRequestCountReached();
         }
+        ISDIncentiveController(staderConfig.getSDIncentiveController()).claim(msg.sender);
         sdRequestedForWithdraw += _sdAmountToWithdraw;
         delegatorWithdrawRequests[nextRequestId] = DelegatorWithdrawInfo(
             msg.sender,