feat: Enhance CookieJar functionality with ERC1155 support and error handling

This commit introduces support for ERC1155 tokens in the CookieJar contract, allowing for more flexible withdrawal options. It adds new error handling for withdrawal attempts that have already been executed, improving user feedback. Additionally, the test suite is updated to include comprehensive tests for the new ERC1155 functionality, ensuring robust coverage and reliability.

Co-authored-by: contact <[email protected]>

Author: Oba-One

client/config/deployments.auto.ts

@@ -5,7 +5,7 @@
  * It contains the latest factory addresses and V2 chain detection.
  * 
  * Generated by: contracts/script/DeployLocal.s.sol
- * Last updated: 1759203080
+ * Last updated: 1759257540
  * Chain ID: 31337 (Local Development)
  */
 
@@ -23,10 +23,10 @@ export const DEPLOYMENTS: Record<number, DeploymentInfo> = {
   // Local Development (Anvil)
   31337: {
     chainId: 31337,
-    factoryAddress: "0x019fC5F69832631B713350b8e7DF784a01d53c92",
+    factoryAddress: "0x0F3D1fD06658007BDE049366C9d2091d243D2e52",
     isV2: true,
     blockNumber: 0,
-    timestamp: 1759203080
+    timestamp: 1759257540
   },
 
   // Legacy V1 deployments (manually maintained)
@@ -69,6 +69,6 @@ export function getDeploymentInfo(chainId: number): DeploymentInfo | undefined {
 }
 
 // Generation metadata
-export const GENERATED_AT = "1759203080"
+export const GENERATED_AT = "1759257540"
 export const GENERATOR = "Cookie Jar Local Development System v2.0"
 export const DEPLOYED_CHAIN = 31337

client/generated.ts

@@ -899,6 +899,7 @@ export const cookieJarAbi = [
     inputs: [{ name: 'chainId', internalType: 'uint256', type: 'uint256' }],
     name: 'UnsupportedChain',
   },
+  { type: 'error', inputs: [], name: 'WithdrawalAlreadyDone' },
   {
     type: 'error',
     inputs: [

contracts/src/CookieJar.sol

@@ -360,16 +360,19 @@ contract CookieJar is AccessControl, Pausable, ReentrancyGuard {
 
     /// @notice Legacy function for allowlist mode (backwards compatibility)
     function withdrawAllowlistMode(uint256 amount, string calldata purpose) external {
+        if (ACCESS_TYPE != CookieJarLib.AccessType.Allowlist) revert CookieJarLib.InvalidAccessType();
         withdraw(amount, purpose);
     }
 
     /// @notice Legacy function for ERC721 mode (backwards compatibility)
     function withdrawWithErc721(uint256 amount, string calldata purpose) external {
+        if (ACCESS_TYPE != CookieJarLib.AccessType.ERC721) revert CookieJarLib.InvalidAccessType();
         withdraw(amount, purpose);
     }
 
     /// @notice Legacy function for ERC1155 mode (backwards compatibility)
     function withdrawWithErc1155(uint256 amount, string calldata purpose) external {
+        if (ACCESS_TYPE != CookieJarLib.AccessType.ERC1155) revert CookieJarLib.InvalidAccessType();
         withdraw(amount, purpose);
     }
 
@@ -479,7 +482,7 @@ contract CookieJar is AccessControl, Pausable, ReentrancyGuard {
 
         // Validate one-time constraint
         if (ONE_TIME_WITHDRAWAL && totalWithdrawn[msg.sender] > 0) {
-            revert CookieJarLib.NotAuthorized();
+            revert CookieJarLib.WithdrawalAlreadyDone();
         }
 
         // Validate period limits using user-specific rolling period
@@ -525,13 +528,37 @@ contract CookieJar is AccessControl, Pausable, ReentrancyGuard {
 
     function _grantRoles(bytes32 role, address[] memory users) internal {
         for (uint256 i = 0; i < users.length; i++) {
+            // Only add to allowlist if role wasn't previously granted
+            bool hadRole = hasRole(role, users[i]);
             _grantRole(role, users[i]);
+            // Update allowlist array for JAR_ALLOWLISTED role (only if newly granted)
+            if (role == CookieJarLib.JAR_ALLOWLISTED && !hadRole) {
+                allowlist.push(users[i]);
+            }
         }
     }
 
     function _revokeRoles(bytes32 role, address[] memory users) internal {
         for (uint256 i = 0; i < users.length; i++) {
             _revokeRole(role, users[i]);
+            // Update allowlist array for JAR_ALLOWLISTED role
+            if (role == CookieJarLib.JAR_ALLOWLISTED) {
+                _removeFromAllowlist(users[i]);
+            }
+        }
+    }
+    
+    /// @notice Remove address from allowlist array
+    /// @dev Helper function to maintain allowlist array consistency
+    function _removeFromAllowlist(address user) internal {
+        for (uint256 i = 0; i < allowlist.length; i++) {
+            if (allowlist[i] == user) {
+                // Move last element to the position of removed element
+                allowlist[i] = allowlist[allowlist.length - 1];
+                // Remove last element
+                allowlist.pop();
+                break;
+            }
         }
     }