Claim available amount

stader-labs · Jan 7, 2024 · f79c803 · f79c803
1 parent fe32591
commit f79c803
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/contracts/OperatorRewardsCollector.sol b/contracts/OperatorRewardsCollector.sol
@@ -51,7 +51,10 @@ contract OperatorRewardsCollector is IOperatorRewardsCollector, AccessControlUpg
      * @param operator The address of the operator for whom the claim is being made.
      */
     function claimFor(address operator, uint256 amount) public override {
-        if (amount == 0) amount = balances[operator]; // If no amount is specified, claim the full balance
+        if (amount == 0)
+            amount = balances[operator] > withdrawableInEth(operator)
+                ? withdrawableInEth(operator)
+                : balances[operator]; // If no amount is specified, claim the available full balance
 
         _completeLiquidationIfExists(operator);
         _transferBackUtilizedSD(operator);

diff --git a/test/foundry_tests/SDIncentiveController.t.sol b/test/foundry_tests/SDIncentiveController.t.sol
@@ -178,6 +178,10 @@ contract SDIncentiveControllerTest is Test {
         vm.stopPrank();
 
         vm.roll(block.number + duration);
-        assertApproxEqAbs(earned + sdIncentiveController.earned(user2) + sdIncentiveController.earned(user), incentiveAmount, 1e9);
+        uint256 preEarned = earned + sdIncentiveController.earned(user2) + sdIncentiveController.earned(user);
+        assertApproxEqAbs(preEarned, incentiveAmount, 1e9);
+
+        vm.roll(block.number + duration*10);
+        assertEq(earned + sdIncentiveController.earned(user2) + sdIncentiveController.earned(user), preEarned);
     }
 }