Merge pull request #14 from greenpill-dev-guild/feat/nft-gates-patch

feat: Introduce denylist functionality and update environment configurations

Author: Oba-One

.cursorignore

@@ -0,0 +1,7 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+.env
+.env.local
+.env.development
+.env.test
+.env.production
+

.env.sample

@@ -4,14 +4,8 @@
 # BLOCKCHAIN NETWORKS & RPC ENDPOINTS
 # =============================================================================
 
-# Alchemy API Keys (for enhanced NFT data and metadata)
-NEXT_PUBLIC_ALCHEMY_API_KEY_MAINNET=your_alchemy_api_key_for_ethereum_mainnet
-NEXT_PUBLIC_ALCHEMY_API_KEY_BASE=your_alchemy_api_key_for_base
-NEXT_PUBLIC_ALCHEMY_API_KEY_SEPOLIA=your_alchemy_api_key_for_sepolia
-NEXT_PUBLIC_ALCHEMY_API_KEY_BASE_SEPOLIA=your_alchemy_api_key_for_base_sepolia
-
-# Alternative: Single Alchemy key for all networks (fallback)
-NEXT_PUBLIC_ALCHEMY_API_KEY=your_general_alchemy_api_key
+# Alchemy API Key (works across all supported networks)
+NEXT_PUBLIC_ALCHEMY_API_KEY=your_alchemy_api_key
 
 # Moralis API Key (alternative NFT provider)
 NEXT_PUBLIC_MORALIS_API_KEY=your_moralis_api_key
@@ -73,9 +67,15 @@ NEXT_PUBLIC_SENTRY_DSN=your_sentry_dsn
 # =============================================================================
 # CONTRACT DEPLOYMENT CONFIGURATION  
 # =============================================================================
-# DO NOT PUT PRIVATE KEYS HERE!
-# Use Foundry Keystore instead: cast wallet import deployer --interactive
-# This is just the address for reference
+# Production deployments use Foundry Keystore (SECURE)
+# Import your account: cast wallet import deployer --interactive
+KEYSTORE_ACCOUNT=deployer
+
+# Local development only (NOT for production!)
+# Only set this for local Anvil deployments
+# PRIVATE_KEY=your_private_key_for_local_development_only
+
+# Deployer address for reference (not used in deployment)
 DEPLOYER_ADDRESS=your_deployer_address
 
 

client/README.md

@@ -36,7 +36,7 @@ Cookie Jar is a platform that enables teams, communities, and organizations to m
 - Fees go directly to a designated fee collector address
 
 ### Comprehensive Security Features
-- Blacklist functionality to block problematic addresses
+- Denylist functionality to block problematic addresses
 - Emergency withdrawal option for admin (can be disabled)
 - Custom error handling for secure transaction processing
 
@@ -45,7 +45,7 @@ Cookie Jar is a platform that enables teams, communities, and organizations to m
 - Any ERC20 token
 
 ### Flexible Administration
-- Manage whitelist and blacklist entries
+- Manage allowlist and denylist entries
 - Add NFT gates (up to 5 different collections)
 - Transfer admin rights when needed
 - Update the fee collector address
@@ -253,7 +253,7 @@ Create a `.env.local` file with the following variables:
 
 ```plaintext
 NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=your_wallet_connect_project_id
-NEXT_PUBLIC_ALCHEMY_ID=your_alchemy_api_key
+NEXT_PUBLIC_ALCHEMY_API_KEY=your_alchemy_api_key
 ```
 
 4. Run the development server:
@@ -293,7 +293,7 @@ As a jar admin, you can:
 
 - Transfer jar ownership
 - Add/remove addresses from whitelist
-- Add/remove addresses from blacklist
+- Add/remove addresses from denylist
 - Add/remove NFT gates
 - Perform emergency withdrawals (if enabled)
 

client/app/jar/[address]/page.tsx

@@ -664,8 +664,8 @@ export default function CookieJarConfigDetails() {
                     <div className="flex justify-between items-center py-2">
                       <span className="text-[#4a3520] font-medium">Your Status</span>
                       <div className="flex items-center">
-                        {config.blacklist ? (
-                          <span className="font-medium px-3 py-1 rounded-full text-white bg-red-500">Blacklisted</span>
+                        {config.denylist ? (
+                          <span className="font-medium px-3 py-1 rounded-full text-white bg-red-500">Denylisted</span>
                         ) : (
                           <span
                             className={`font-medium px-3 py-1 rounded-full text-white ${config.allowlist ? "bg-green-500" : "bg-red-500"}`}
@@ -712,13 +712,13 @@ export default function CookieJarConfigDetails() {
                       <div className="mt-6">
                         <h3 className="text-base font-semibold text-[#3c2a14] mb-2">Your Status</h3>
                         <div className="flex flex-wrap gap-2">
-                          {config.blacklist ? (
+                          {config.denylist ? (
                             <Badge
                               variant="outline"
                               className="flex items-center gap-1 bg-[#ffebee] text-[#c62828] border-[#c62828] px-3 py-1"
                             >
                               <ShieldAlert className="h-3 w-3 mr-1" />
-                              Blacklisted
+                              Denylisted
                             </Badge>
                           ) : (
                             showUserFunctions && (
@@ -878,10 +878,10 @@ export default function CookieJarConfigDetails() {
                   <CardDescription className="text-[#8b7355]">Receive cookies from this jar</CardDescription>
                 </CardHeader>
                 <CardContent className="p-8 relative min-h-[400px]">
-                  {config.blacklist ? (
+                  {config.denylist ? (
                     <div className="absolute inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-10 rounded-b-lg">
                       <div className="bg-red-500 text-white font-medium px-6 py-2 rounded-full text-lg">
-                        You are Blacklisted
+                        You are Denylisted
                       </div>
                     </div>
                   ) : isInCooldown ? (

client/config/deployments.auto.ts

@@ -5,7 +5,7 @@
  * It contains the latest factory addresses and V2 chain detection.
  * 
  * Generated by: contracts/script/Deploy.s.sol
- * Last updated: 1758329506
+ * Last updated: 1758353536
  * Chain ID: 84532
  */
 
@@ -25,8 +25,8 @@ export const DEPLOYMENTS: Record<number, DeploymentInfo> = {
     chainId: 84532,
     factoryAddress: "0x5b73C5498c1E3b4dbA84de0F1833c4a029d90519",
     isV2: true,
-    blockNumber: 0,
-    timestamp: 1758329506
+    blockNumber: 31292624,
+    timestamp: 1758353536
   },
 
   // Legacy V1 deployments (manually maintained)
@@ -69,6 +69,6 @@ export function getDeploymentInfo(chainId: number): DeploymentInfo | undefined {
 }
 
 // Generation metadata
-export const GENERATED_AT = "1758329506"
+export const GENERATED_AT = "1758353536"
 export const GENERATOR = "Cookie Jar Deployment System v2.0"
 export const DEPLOYED_CHAIN = 84532

client/config/supported-networks.ts

@@ -181,7 +181,7 @@ export const contractAddresses: ContractAddresses = {
 
 // Get environment variables
 const projectId = process.env.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID || ""
-const alchemyId = process.env.NEXT_PUBLIC_ALCHEMY_ID || ""
+const alchemyId = process.env.NEXT_PUBLIC_ALCHEMY_API_KEY || ""
 
 // Helper function to create fallback transports with automatic failover
 function createFallbackTransport(primary: string[], fallbackUrls: string[]) {

client/generated.ts

@@ -301,6 +301,13 @@ export const cookieJarAbi = [
     outputs: [],
     stateMutability: 'nonpayable',
   },
+  {
+    type: 'function',
+    inputs: [{ name: '_users', internalType: 'address[]', type: 'address[]' }],
+    name: 'grantJarDenylistRole',
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
   {
     type: 'function',
     inputs: [
@@ -487,6 +494,13 @@ export const cookieJarAbi = [
     outputs: [],
     stateMutability: 'nonpayable',
   },
+  {
+    type: 'function',
+    inputs: [{ name: '_users', internalType: 'address[]', type: 'address[]' }],
+    name: 'revokeJarDenylistRole',
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
   {
     type: 'function',
     inputs: [
@@ -1054,6 +1068,7 @@ export const cookieJarAbi = [
   },
   { type: 'error', inputs: [], name: 'TooManyNFTGates' },
   { type: 'error', inputs: [], name: 'TransferFailed' },
+  { type: 'error', inputs: [], name: 'UserDenylisted' },
   { type: 'error', inputs: [], name: 'WithdrawalAlreadyDone' },
   {
     type: 'error',
@@ -1097,14 +1112,14 @@ export const cookieJarFactoryAbi = [
   {
     type: 'function',
     inputs: [],
-    name: 'BLACKLISTED_JAR_CREATORS',
+    name: 'DEFAULT_ADMIN_ROLE',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
     stateMutability: 'view',
   },
   {
     type: 'function',
     inputs: [],
-    name: 'DEFAULT_ADMIN_ROLE',
+    name: 'DENYLISTED_JAR_CREATORS',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
     stateMutability: 'view',
   },
@@ -1303,7 +1318,7 @@ export const cookieJarFactoryAbi = [
   {
     type: 'function',
     inputs: [{ name: '_users', internalType: 'address[]', type: 'address[]' }],
-    name: 'grantBlacklistedJarCreatorsRole',
+    name: 'grantDenylistedJarCreatorsRole',
     outputs: [],
     stateMutability: 'nonpayable',
   },
@@ -1361,7 +1376,7 @@ export const cookieJarFactoryAbi = [
   {
     type: 'function',
     inputs: [{ name: '_users', internalType: 'address[]', type: 'address[]' }],
-    name: 'revokeBlacklistedJarCreatorsRole',
+    name: 'revokeDenylistedJarCreatorsRole',
     outputs: [],
     stateMutability: 'nonpayable',
   },
@@ -1499,7 +1514,7 @@ export const cookieJarFactoryAbi = [
     ],
     name: 'AccessControlUnauthorizedAccount',
   },
-  { type: 'error', inputs: [], name: 'CookieJarFactory__Blacklisted' },
+  { type: 'error', inputs: [], name: 'CookieJarFactory__Denylisted' },
   { type: 'error', inputs: [], name: 'CookieJarFactory__JarNotFound' },
   { type: 'error', inputs: [], name: 'CookieJarFactory__NotJarOwner' },
   { type: 'error', inputs: [], name: 'CookieJarFactory__NotValidERC20' },
@@ -2029,6 +2044,15 @@ export const useWriteCookieJarGrantJarAllowlistRole =
     functionName: 'grantJarAllowlistRole',
   })
 
+/**
+ * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"grantJarDenylistRole"`
+ */
+export const useWriteCookieJarGrantJarDenylistRole =
+  /*#__PURE__*/ createUseWriteContract({
+    abi: cookieJarAbi,
+    functionName: 'grantJarDenylistRole',
+  })
+
 /**
  * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"grantRole"`
  */
@@ -2072,6 +2096,15 @@ export const useWriteCookieJarRevokeJarAllowlistRole =
     functionName: 'revokeJarAllowlistRole',
   })
 
+/**
+ * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"revokeJarDenylistRole"`
+ */
+export const useWriteCookieJarRevokeJarDenylistRole =
+  /*#__PURE__*/ createUseWriteContract({
+    abi: cookieJarAbi,
+    functionName: 'revokeJarDenylistRole',
+  })
+
 /**
  * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"revokeRole"`
  */
@@ -2238,6 +2271,15 @@ export const useSimulateCookieJarGrantJarAllowlistRole =
     functionName: 'grantJarAllowlistRole',
   })
 
+/**
+ * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"grantJarDenylistRole"`
+ */
+export const useSimulateCookieJarGrantJarDenylistRole =
+  /*#__PURE__*/ createUseSimulateContract({
+    abi: cookieJarAbi,
+    functionName: 'grantJarDenylistRole',
+  })
+
 /**
  * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"grantRole"`
  */
@@ -2283,6 +2325,15 @@ export const useSimulateCookieJarRevokeJarAllowlistRole =
     functionName: 'revokeJarAllowlistRole',
   })
 
+/**
+ * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"revokeJarDenylistRole"`
+ */
+export const useSimulateCookieJarRevokeJarDenylistRole =
+  /*#__PURE__*/ createUseSimulateContract({
+    abi: cookieJarAbi,
+    functionName: 'revokeJarDenylistRole',
+  })
+
 /**
  * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarAbi}__ and `functionName` set to `"revokeRole"`
  */
@@ -2586,21 +2637,21 @@ export const useReadCookieJarFactory = /*#__PURE__*/ createUseReadContract({
 })
 
 /**
- * Wraps __{@link useReadContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"BLACKLISTED_JAR_CREATORS"`
+ * Wraps __{@link useReadContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"DEFAULT_ADMIN_ROLE"`
  */
-export const useReadCookieJarFactoryBlacklistedJarCreators =
+export const useReadCookieJarFactoryDefaultAdminRole =
   /*#__PURE__*/ createUseReadContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'BLACKLISTED_JAR_CREATORS',
+    functionName: 'DEFAULT_ADMIN_ROLE',
   })
 
 /**
- * Wraps __{@link useReadContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"DEFAULT_ADMIN_ROLE"`
+ * Wraps __{@link useReadContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"DENYLISTED_JAR_CREATORS"`
  */
-export const useReadCookieJarFactoryDefaultAdminRole =
+export const useReadCookieJarFactoryDenylistedJarCreators =
   /*#__PURE__*/ createUseReadContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'DEFAULT_ADMIN_ROLE',
+    functionName: 'DENYLISTED_JAR_CREATORS',
   })
 
 /**
@@ -2753,12 +2804,12 @@ export const useWriteCookieJarFactoryCreateCookieJar =
   })
 
 /**
- * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"grantBlacklistedJarCreatorsRole"`
+ * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"grantDenylistedJarCreatorsRole"`
  */
-export const useWriteCookieJarFactoryGrantBlacklistedJarCreatorsRole =
+export const useWriteCookieJarFactoryGrantDenylistedJarCreatorsRole =
   /*#__PURE__*/ createUseWriteContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'grantBlacklistedJarCreatorsRole',
+    functionName: 'grantDenylistedJarCreatorsRole',
   })
 
 /**
@@ -2780,12 +2831,12 @@ export const useWriteCookieJarFactoryRenounceRole =
   })
 
 /**
- * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"revokeBlacklistedJarCreatorsRole"`
+ * Wraps __{@link useWriteContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"revokeDenylistedJarCreatorsRole"`
  */
-export const useWriteCookieJarFactoryRevokeBlacklistedJarCreatorsRole =
+export const useWriteCookieJarFactoryRevokeDenylistedJarCreatorsRole =
   /*#__PURE__*/ createUseWriteContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'revokeBlacklistedJarCreatorsRole',
+    functionName: 'revokeDenylistedJarCreatorsRole',
   })
 
 /**
@@ -2822,12 +2873,12 @@ export const useSimulateCookieJarFactoryCreateCookieJar =
   })
 
 /**
- * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"grantBlacklistedJarCreatorsRole"`
+ * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"grantDenylistedJarCreatorsRole"`
  */
-export const useSimulateCookieJarFactoryGrantBlacklistedJarCreatorsRole =
+export const useSimulateCookieJarFactoryGrantDenylistedJarCreatorsRole =
   /*#__PURE__*/ createUseSimulateContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'grantBlacklistedJarCreatorsRole',
+    functionName: 'grantDenylistedJarCreatorsRole',
   })
 
 /**
@@ -2849,12 +2900,12 @@ export const useSimulateCookieJarFactoryRenounceRole =
   })
 
 /**
- * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"revokeBlacklistedJarCreatorsRole"`
+ * Wraps __{@link useSimulateContract}__ with `abi` set to __{@link cookieJarFactoryAbi}__ and `functionName` set to `"revokeDenylistedJarCreatorsRole"`
  */
-export const useSimulateCookieJarFactoryRevokeBlacklistedJarCreatorsRole =
+export const useSimulateCookieJarFactoryRevokeDenylistedJarCreatorsRole =
   /*#__PURE__*/ createUseSimulateContract({
     abi: cookieJarFactoryAbi,
-    functionName: 'revokeBlacklistedJarCreatorsRole',
+    functionName: 'revokeDenylistedJarCreatorsRole',
   })
 
 /**