@bananapus/distributor-v6 0.0.45 → 0.0.46

package/README.md

@@ -75,7 +75,9 @@ This repo does not explain why an allocation exists. It only defines how funded
   NFT's tier
 - `recycleExpiredRewards` is permissionless; it recycles the expired round's unmaterialized remainder while preserving
   amounts that already started vesting
-- eligible expired and forfeited rewards stay in distributor inventory and are recycled into the current reward round
+- eligible expired and forfeited rewards stay in distributor inventory and are recycled into the current reward round.
+  A reward round never recycles into itself; if the requested round is still current, the call is a no-op, including
+  for zero-stake rounds
 - revnet loan-backed vesting is opt-in at deployment; the reward token must be a REVOwner-owned revnet token, the
   distributor keeps the loan NFT, and repayment restores the original vesting schedule instead of releasing all
   collateral immediately

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/distributor-v6",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/JBDistributor.sol

@@ -305,7 +305,8 @@ abstract contract JBDistributor is IJBDistributor {
     }
 
     /// @notice Recycle unclaimed rewards from expired reward rounds into the current reward round.
-    /// @dev Recycling is permissionless; any keeper or frontend can sweep an expired round.
+    /// @dev Recycling is permissionless; any keeper or frontend can sweep an eligible prior round. Passing the current
+    /// reward round is a no-op, even when its snapshot stake is zero.
     /// @param hook The hook whose expired rewards should be recycled.
     /// @param token The reward token to recycle.
     /// @param rounds The reward rounds to recycle.
@@ -1185,6 +1186,11 @@ abstract contract JBDistributor is IJBDistributor {
         internal
         returns (uint256 recycleAmount)
     {
+        // Never recycle a round into itself. This keeps raw round accounting stable for zero-stake current rounds; the
+        // same inventory can be swept once a later round is current.
+        uint256 recycledToRound = currentRound();
+        if (round == recycledToRound) return 0;
+
         // Load the reward round once so expiry, claimed amount, and funded amount stay in sync.
         JBRewardRoundData storage rewardRound = rewardRoundOf[hook][groupId][token][round];
 
@@ -1204,7 +1210,6 @@ abstract contract JBDistributor is IJBDistributor {
         rewardRound.claimedAmount = rewardRound.amount;
 
         // Keep the inventory in the distributor and give the current staker set a new claimable round.
-        uint256 recycledToRound = currentRound();
         _recordRewardRound({hook: hook, groupId: groupId, token: token, amount: recycleAmount});
 
         // Surface the permissionless recycle for off-chain accounting.

package/src/interfaces/IJBDistributor.sol

@@ -301,7 +301,8 @@ interface IJBDistributor {
     /// @notice Record the snapshot block for the current round. Callable by anyone (keepers, frontends).
     function poke() external;
 
-    /// @notice Recycle unclaimed rewards from expired default-group reward rounds into the current reward round.
+    /// @notice Recycle unclaimed rewards from eligible prior default-group reward rounds into the current reward round.
+    /// @dev Passing the current round is a no-op, including for zero-stake rounds.
     /// @param hook The hook whose expired reward rounds should be recycled.
     /// @param token The reward token to recycle.
     /// @param rounds The reward rounds to recycle.