claimAll() should allow empty array for tokens or nfts, but not both

PaintSwap · Feb 15, 2024 · 845e099 · 845e099
1 parent 1be6332
commit 845e099
Show file tree

Hide file tree

Showing 2 changed files with 613 additions and 483 deletions.
diff --git a/contracts/SamWitchOrderBook.sol b/contracts/SamWitchOrderBook.sol
@@ -345,8 +345,21 @@ contract SamWitchOrderBook is ISamWitchOrderBook, ERC1155Holder, UUPSUpgradeable
     uint[] calldata _nftOrderIds,
     uint[] calldata _tokenIds
   ) external override {
-    claimTokens(_brushOrderIds);
-    claimNFTs(_nftOrderIds, _tokenIds);
+    if (_brushOrderIds.length == 0 && _nftOrderIds.length == 0 && _tokenIds.length == 0) {
+      revert NothingToClaim();
+    }
+
+    if (_brushOrderIds.length + _nftOrderIds.length > MAX_CLAIMABLE_ORDERS) {
+      revert ClaimingTooManyOrders();
+    }
+
+    if (_brushOrderIds.length != 0) {
+      claimTokens(_brushOrderIds);
+    }
+
+    if (_nftOrderIds.length != 0) {
+      claimNFTs(_nftOrderIds, _tokenIds);
+    }
   }
 
   /// @notice Get the amount of tokens claimable for these orders