@bananapus/distributor-v6 0.0.12 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/distributor-v6",
-  "version": "0.0.12",
+  "version": "0.0.15",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "deploy:testnets": "source ./.env && npx sphinx propose ./script/Deploy.s.sol --networks testnets"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "0.0.43",
-    "@bananapus/core-v6": "0.0.43",
-    "@bananapus/permission-ids-v6": "0.0.22",
+    "@bananapus/721-hook-v6": "^0.0.47",
+    "@bananapus/core-v6": "^0.0.48",
+    "@bananapus/permission-ids-v6": "^0.0.22",
     "@openzeppelin/contracts": "5.6.1",
     "@prb/math": "4.1.1"
   },

package/src/JBDistributor.sol

@@ -107,6 +107,14 @@ abstract contract JBDistributor is IJBDistributor {
     mapping(address hook => mapping(IERC20 token => mapping(uint256 round => JBTokenSnapshotData snapshot))) internal
         _snapshotAtRoundOf;
 
+    /// @notice Whether a snapshot has been taken for a given (hook, token, round).
+    /// @dev Required because a snapshot can legitimately store `{balance: 0, vestingAmount: 0}`,
+    /// so a zero balance is not a usable sentinel for "uninitialized".
+    /// @custom:param hook The hook the snapshot is for.
+    /// @custom:param token The address of the token claimed and vested.
+    /// @custom:param round The round to which the data applies.
+    mapping(address hook => mapping(IERC20 token => mapping(uint256 round => bool))) internal _snapshotInitializedFor;
+
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
@@ -469,18 +477,20 @@ abstract contract JBDistributor is IJBDistributor {
         // Keep a reference to the current round.
         uint256 round = currentRound();
 
-        // Keep a reference to the token's snapshot.
-        snapshot = _snapshotAtRoundOf[hook][token][round];
-
-        // If a snapshot was already taken at this cycle, do not take a new one.
-        if (snapshot.balance != 0) return snapshot;
+        // If a snapshot was already taken at this round, do not take a new one. The init flag must be used as the
+        // sentinel: a zero balance is a valid snapshot value (round started with no funded balance), not a signal
+        // to re-snapshot. Re-snapshotting would let mid-round deposits leak into the current round's allocation.
+        if (_snapshotInitializedFor[hook][token][round]) {
+            return _snapshotAtRoundOf[hook][token][round];
+        }
 
         // Take a snapshot using the hook's tracked balance.
         snapshot =
             JBTokenSnapshotData({balance: _balanceOf[hook][token], vestingAmount: totalVestingAmountOf[hook][token]});
 
-        // Store the snapshot.
+        // Store the snapshot and mark it initialized.
         _snapshotAtRoundOf[hook][token][round] = snapshot;
+        _snapshotInitializedFor[hook][token][round] = true;
 
         emit SnapshotCreated({
             hook: hook, round: round, token: token, balance: snapshot.balance, vestingAmount: snapshot.vestingAmount
@@ -674,6 +684,14 @@ abstract contract JBDistributor is IJBDistributor {
             // Keep a reference to the amount of tokens being claimed.
             uint256 tokenAmount = mulDiv(distributable, _tokenStake({hook: hook, tokenId: tokenId}), totalStakeAmount);
 
+            // Skip zero-amount entries to prevent stalling latestVestedIndexOf advancement.
+            if (tokenAmount == 0) {
+                unchecked {
+                    ++j;
+                }
+                continue;
+            }
+
             // Add to the list of vesting data.
             vestings.push(JBVestingData({releaseRound: vestingReleaseRound, amount: tokenAmount, shareClaimed: 0}));