@bananapus/distributor-v6 0.0.27 → 0.0.28

package/package.json

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

package/src/JB721Distributor.sol

@@ -35,12 +35,12 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    /// @notice Thrown when a claim batch repeats an NFT token ID.
-    error JB721Distributor_DuplicateTokenId(uint256 tokenId);
-
     /// @notice Thrown when native ETH does not match the split hook context amount.
     error JB721Distributor_NativeAmountMismatch(uint256 msgValue, uint256 contextAmount);
 
+    /// @notice Thrown when claim batch NFT token IDs are not strictly increasing.
+    error JB721Distributor_TokenIdsNotIncreasing(uint256 previousTokenId, uint256 tokenId);
+
     /// @notice Thrown when native ETH is sent but context.token is not NATIVE_TOKEN.
     error JB721Distributor_TokenMismatch(address token, address expectedToken, uint256 msgValue);
 
@@ -547,21 +547,16 @@ contract JB721Distributor is JBDistributor, IJB721Distributor {
     /// @param hook The 721 hook whose NFT owners are claiming.
     /// @param tokenIds The NFT token IDs to check.
     function _requireCanClaimTokenIds(address hook, uint256[] calldata tokenIds) internal view {
-        // Each requested NFT must currently belong to msg.sender and appear only once in the batch.
+        // Each requested NFT must currently belong to msg.sender and appear in strictly increasing order.
         for (uint256 i; i < tokenIds.length;) {
             uint256 tokenId = tokenIds[i];
 
-            if (!_canClaim({hook: hook, tokenId: tokenId, account: msg.sender})) {
-                revert JBDistributor_NoAccess({hook: hook, tokenId: tokenId, account: msg.sender});
+            if (i != 0 && tokenId <= tokenIds[i - 1]) {
+                revert JB721Distributor_TokenIdsNotIncreasing({previousTokenId: tokenIds[i - 1], tokenId: tokenId});
             }
 
-            // Reject duplicates before reward accounting so one NFT cannot replay the same historical round.
-            for (uint256 j = i + 1; j < tokenIds.length;) {
-                if (tokenIds[j] == tokenId) revert JB721Distributor_DuplicateTokenId({tokenId: tokenId});
-
-                unchecked {
-                    ++j;
-                }
+            if (!_canClaim({hook: hook, tokenId: tokenId, account: msg.sender})) {
+                revert JBDistributor_NoAccess({hook: hook, tokenId: tokenId, account: msg.sender});
             }
 
             unchecked {