@bananapus/721-hook-v6 0.0.25 → 0.0.27

package/package.json

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

package/src/JB721TiersHook.sol

@@ -42,6 +42,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     //*********************************************************************//
 
     error JB721TiersHook_AlreadyInitialized(uint256 projectId);
+    error JB721TiersHook_CantBuyWithCredits();
     error JB721TiersHook_CurrencyMismatch(uint256 paymentCurrency, uint256 tierCurrency);
     error JB721TiersHook_InvalidPricingDecimals(uint256 decimals);
     error JB721TiersHook_MintReserveNftsPaused();
@@ -387,23 +388,13 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
 
         // Record the mint. The token IDs returned correspond to the tiers passed in.
         // slither-disable-next-line reentrancy-events,unused-return
-        (tokenIds,) = STORE.recordMint({
+        (tokenIds,,) = STORE.recordMint({
             amount: type(uint256).max, // force the mint.
             tierIds: tierIds,
             isOwnerMint: true // manual mint.
         });
 
-        for (uint256 i; i < tierIds.length; i++) {
-            // Set the token ID.
-            uint256 tokenId = tokenIds[i];
-
-            // Mint the NFT.
-            _mint({to: beneficiary, tokenId: tokenId});
-
-            emit Mint({
-                tokenId: tokenId, tierId: tierIds[i], beneficiary: beneficiary, totalAmountPaid: 0, caller: _msgSender()
-            });
-        }
+        _mintTokens({tokenIds: tokenIds, tierIds: tierIds, beneficiary: beneficiary, totalAmountPaid: 0});
     }
 
     /// @notice Mint pending reserved NFTs based on the provided information.
@@ -594,47 +585,30 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         STORE.recordBurn(tokenIds);
     }
 
-    /// @notice Mints one NFT from each of the specified tiers for the beneficiary.
-    /// @dev The same tier can be specified more than once.
-    /// @param amount The amount to base the mints on. The total price of the NFTs being minted cannot be larger than
-    /// this amount.
-    /// @param mintTierIds An array of NFT tier IDs to be minted.
-    /// @param beneficiary The address receiving the newly minted NFTs.
-    /// @return leftoverAmount The `amount` leftover after minting.
-    function _mintAll(
-        uint256 amount,
-        uint16[] memory mintTierIds,
-        address beneficiary
+    /// @notice Mints NFTs and emits events for each.
+    /// @param tokenIds The token IDs to mint.
+    /// @param tierIds The tier IDs corresponding to each token.
+    /// @param beneficiary The address receiving the NFTs.
+    /// @param totalAmountPaid The amount to report in the Mint event.
+    function _mintTokens(
+        uint256[] memory tokenIds,
+        uint16[] memory tierIds,
+        address beneficiary,
+        uint256 totalAmountPaid
     )
         internal
-        returns (uint256 leftoverAmount)
     {
-        // Keep a reference to the NFT token IDs.
-        uint256[] memory tokenIds;
-
-        // Record the NFT mints. The token IDs returned correspond to the tier IDs passed in.
-        (tokenIds, leftoverAmount) = STORE.recordMint({
-            amount: amount,
-            tierIds: mintTierIds,
-            isOwnerMint: false // Not a manual mint
-        });
-
-        // Loop through each token ID and mint the corresponding NFT.
         for (uint256 i; i < tokenIds.length; i++) {
-            // Get a reference to the token ID being iterated on.
-            uint256 tokenId = tokenIds[i];
-
             emit Mint({
-                tokenId: tokenId,
-                tierId: mintTierIds[i],
+                tokenId: tokenIds[i],
+                tierId: tierIds[i],
                 beneficiary: beneficiary,
-                totalAmountPaid: amount,
+                totalAmountPaid: totalAmountPaid,
                 caller: _msgSender()
             });
 
-            // Mint the NFT.
             // slither-disable-next-line reentrancy-events
-            _mint({to: beneficiary, tokenId: tokenId});
+            _mint({to: beneficiary, tokenId: tokenIds[i]});
         }
     }
 
@@ -683,9 +657,25 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
 
             // Mint NFTs from the tiers as specified.
             if (tierIdsToMint.length != 0) {
+                uint256[] memory tokenIds;
+                uint256 restrictedCost;
+                uint256 totalAmountPaid = leftoverAmount;
+
+                // Record the mints.
                 // slither-disable-next-line reentrancy-events,reentrancy-no-eth
-                leftoverAmount =
-                    _mintAll({amount: leftoverAmount, mintTierIds: tierIdsToMint, beneficiary: context.beneficiary});
+                (tokenIds, leftoverAmount, restrictedCost) =
+                    STORE.recordMint({amount: leftoverAmount, tierIds: tierIdsToMint, isOwnerMint: false});
+
+                // Enforce `cantBuyWithCredits`: restricted tiers must be fully covered by fresh payment (not credits).
+                if (restrictedCost > value) revert JB721TiersHook_CantBuyWithCredits();
+
+                // Mint each token.
+                _mintTokens({
+                    tokenIds: tokenIds,
+                    tierIds: tierIdsToMint,
+                    beneficiary: context.beneficiary,
+                    totalAmountPaid: totalAmountPaid
+                });
             }
         }
 

package/src/JB721TiersHookStore.sol

@@ -331,7 +331,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         JBStored721Tier memory storedTier = _storedTierOf[hook][tierId];
 
         // Check if voting units should be used. Price will be used otherwise.
-        (,, bool useVotingUnits,,) = _unpackBools(storedTier.packedBools);
+        (,, bool useVotingUnits,,,) = _unpackBools(storedTier.packedBools);
 
         // Return the address' voting units within the tier.
         return balance * (useVotingUnits ? _tierVotingUnitsOf[hook][tierId] : storedTier.price);
@@ -376,7 +376,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             JBStored721Tier memory storedTier = _storedTierOf[hook][i];
 
             // Parse the flags.
-            (,, bool useVotingUnits,,) = _unpackBools(storedTier.packedBools);
+            (,, bool useVotingUnits,,,) = _unpackBools(storedTier.packedBools);
 
             // Add the voting units for the address' balance in this tier.
             // Use custom voting units if set. Otherwise, use the tier's price.
@@ -532,13 +532,8 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         // Get a reference to the reserve beneficiary.
         address reserveBeneficiary = reserveBeneficiaryOf({hook: hook, tierId: tierId});
 
-        (
-            bool allowOwnerMint,
-            bool transfersPausable,
-            bool useVotingUnits,
-            bool cannotBeRemoved,
-            bool cannotIncreaseDiscountPercent
-        ) = _unpackBools(storedTier.packedBools);
+        // Cache packed bools to avoid stack-too-deep from destructuring all 6 bools.
+        uint8 packed = storedTier.packedBools;
 
         // slither-disable-next-line calls-loop
         return JB721Tier({
@@ -547,17 +542,18 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             price: storedTier.price,
             remainingSupply: storedTier.remainingSupply,
             initialSupply: storedTier.initialSupply,
-            votingUnits: useVotingUnits ? _tierVotingUnitsOf[hook][tierId] : storedTier.price,
+            votingUnits: (packed & 0x4 != 0) ? _tierVotingUnitsOf[hook][tierId] : storedTier.price,
             // No reserve frequency if there is no reserve beneficiary.
             reserveFrequency: reserveBeneficiary == address(0) ? 0 : storedTier.reserveFrequency,
             reserveBeneficiary: reserveBeneficiary,
             encodedIPFSUri: encodedIPFSUriOf[hook][tierId],
             category: storedTier.category,
             discountPercent: storedTier.discountPercent,
-            allowOwnerMint: allowOwnerMint,
-            transfersPausable: transfersPausable,
-            cannotBeRemoved: cannotBeRemoved,
-            cannotIncreaseDiscountPercent: cannotIncreaseDiscountPercent,
+            allowOwnerMint: (packed & 0x1 != 0),
+            transfersPausable: (packed & 0x2 != 0),
+            cantBeRemoved: (packed & 0x8 != 0),
+            cantIncreaseDiscountPercent: (packed & 0x10 != 0),
+            cantBuyWithCredits: (packed & 0x20 != 0),
             splitPercent: storedTier.splitPercent,
             resolvedUri: !includeResolvedUri || tokenUriResolverOf[hook] == IJB721TokenUriResolver(address(0))
                 ? ""
@@ -678,15 +674,17 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     /// @param allowOwnerMint Whether or not owner minting is allowed in new tiers.
     /// @param transfersPausable Whether or not 721 transfers can be paused.
     /// @param useVotingUnits Whether or not custom voting unit amounts are allowed in new tiers.
-    /// @param cannotBeRemoved Whether or not attempts to remove the tier will revert.
-    /// @param cannotIncreaseDiscountPercent Whether or not attempts to increase the discount percent will revert.
+    /// @param cantBeRemoved Whether or not attempts to remove the tier will revert.
+    /// @param cantIncreaseDiscountPercent Whether or not attempts to increase the discount percent will revert.
+    /// @param cantBuyWithCredits Whether or not the tier cannot be purchased using accumulated pay credits.
     /// @return packed The packed bools.
     function _packBools(
         bool allowOwnerMint,
         bool transfersPausable,
         bool useVotingUnits,
-        bool cannotBeRemoved,
-        bool cannotIncreaseDiscountPercent
+        bool cantBeRemoved,
+        bool cantIncreaseDiscountPercent,
+        bool cantBuyWithCredits
     )
         internal
         pure
@@ -696,18 +694,20 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             packed := or(allowOwnerMint, packed)
             packed := or(shl(0x1, transfersPausable), packed)
             packed := or(shl(0x2, useVotingUnits), packed)
-            packed := or(shl(0x3, cannotBeRemoved), packed)
-            packed := or(shl(0x4, cannotIncreaseDiscountPercent), packed)
+            packed := or(shl(0x3, cantBeRemoved), packed)
+            packed := or(shl(0x4, cantIncreaseDiscountPercent), packed)
+            packed := or(shl(0x5, cantBuyWithCredits), packed)
         }
     }
 
-    /// @notice Unpack five bools from a single uint8.
+    /// @notice Unpack six bools from a single uint8.
     /// @param packed The packed bools.
     /// @param allowOwnerMint Whether or not owner minting is allowed in new tiers.
     /// @param transfersPausable Whether or not 721 transfers can be paused.
     /// @param useVotingUnits Whether or not custom voting unit amounts are allowed in new tiers.
-    /// @param cannotBeRemoved Whether or not the tier can be removed once added.
-    /// @param cannotIncreaseDiscountPercent Whether or not the discount percent cannot be increased.
+    /// @param cantBeRemoved Whether or not the tier can be removed once added.
+    /// @param cantIncreaseDiscountPercent Whether or not the discount percent cannot be increased.
+    /// @param cantBuyWithCredits Whether or not the tier cannot be purchased using accumulated pay credits.
     function _unpackBools(uint8 packed)
         internal
         pure
@@ -715,16 +715,18 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             bool allowOwnerMint,
             bool transfersPausable,
             bool useVotingUnits,
-            bool cannotBeRemoved,
-            bool cannotIncreaseDiscountPercent
+            bool cantBeRemoved,
+            bool cantIncreaseDiscountPercent,
+            bool cantBuyWithCredits
         )
     {
         assembly {
             allowOwnerMint := iszero(iszero(and(0x1, packed)))
             transfersPausable := iszero(iszero(and(0x2, packed)))
             useVotingUnits := iszero(iszero(and(0x4, packed)))
-            cannotBeRemoved := iszero(iszero(and(0x8, packed)))
-            cannotIncreaseDiscountPercent := iszero(iszero(and(0x10, packed)))
+            cantBeRemoved := iszero(iszero(and(0x8, packed)))
+            cantIncreaseDiscountPercent := iszero(iszero(and(0x10, packed)))
+            cantBuyWithCredits := iszero(iszero(and(0x20, packed)))
         }
     }
 
@@ -906,8 +908,9 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
                     allowOwnerMint: tierToAdd.allowOwnerMint,
                     transfersPausable: tierToAdd.transfersPausable,
                     useVotingUnits: tierToAdd.useVotingUnits,
-                    cannotBeRemoved: tierToAdd.cannotBeRemoved,
-                    cannotIncreaseDiscountPercent: tierToAdd.cannotIncreaseDiscountPercent
+                    cantBeRemoved: tierToAdd.cantBeRemoved,
+                    cantIncreaseDiscountPercent: tierToAdd.cantIncreaseDiscountPercent,
+                    cantBuyWithCredits: tierToAdd.cantBuyWithCredits
                 })
             });
 
@@ -1055,6 +1058,8 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     /// @param isOwnerMint A flag indicating whether this function is being directly called by the 721 contract's owner.
     /// @return tokenIds The token IDs of the NFTs which were minted.
     /// @return leftoverAmount The `amount` remaining after minting.
+    /// @return restrictedCost Total cost of tiers with `cantBuyWithCredits` set. The caller can use this to enforce
+    /// credit restrictions.
     function recordMint(
         uint256 amount,
         uint16[] calldata tierIds,
@@ -1062,7 +1067,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     )
         external
         override
-        returns (uint256[] memory tokenIds, uint256 leftoverAmount)
+        returns (uint256[] memory tokenIds, uint256 leftoverAmount, uint256 restrictedCost)
     {
         // Set the leftover amount as the initial amount.
         leftoverAmount = amount;
@@ -1079,6 +1084,9 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         // Initialize a `JBBitmapWord` for checking whether tiers have been removed.
         JBBitmapWord memory bitmapWord;
 
+        // Track total cost of tiers that can't be bought with credits (order-independent check).
+        uint256 restrictedCost;
+
         for (uint256 i; i < numberOfTiers; i++) {
             // Set the tier ID being iterated on.
             uint256 tierId = tierIds[i];
@@ -1092,7 +1100,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             storedTier = _storedTierOf[msg.sender][tierId];
 
             // Parse the flags.
-            (bool allowOwnerMint,,,,) = _unpackBools(storedTier.packedBools);
+            (bool allowOwnerMint,,,,, bool cantBuyWithCredits) = _unpackBools(storedTier.packedBools);
 
             // If this is an owner mint, make sure owner minting is allowed.
             if (isOwnerMint && !allowOwnerMint) revert JB721TiersHookStore_CantMintManually(tierId);
@@ -1113,6 +1121,9 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
                 });
             }
 
+            // Accumulate cost of credit-restricted tiers.
+            if (cantBuyWithCredits) restrictedCost += price;
+
             // Make sure the `amount` is greater than or equal to the tier's price.
             if (price > leftoverAmount) revert JB721TiersHookStore_PriceExceedsAmount(price, leftoverAmount);
 
@@ -1188,10 +1199,10 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             JBStored721Tier storage storedTier = _storedTierOf[msg.sender][tierId];
 
             // Parse the flags.
-            (,,, bool cannotBeRemoved,) = _unpackBools(storedTier.packedBools);
+            (,,, bool cantBeRemoved,,) = _unpackBools(storedTier.packedBools);
 
             // Make sure the tier can be removed.
-            if (cannotBeRemoved) revert JB721TiersHookStore_CantRemoveTier(tierId);
+            if (cantBeRemoved) revert JB721TiersHookStore_CantRemoveTier(tierId);
 
             // Remove the tier by marking it as removed in the bitmap.
             _removedTiersBitmapWordOf[msg.sender].removeTier(tierId);
@@ -1217,10 +1228,10 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         JBStored721Tier storage storedTier = _storedTierOf[msg.sender][tierId];
 
         // Parse the flags.
-        (,,,, bool cannotIncreaseDiscountPercent) = _unpackBools(storedTier.packedBools);
+        (,,,, bool cantIncreaseDiscountPercent,) = _unpackBools(storedTier.packedBools);
 
         // Make sure that increasing the discount is allowed for the tier.
-        if (discountPercent > storedTier.discountPercent && cannotIncreaseDiscountPercent) {
+        if (discountPercent > storedTier.discountPercent && cantIncreaseDiscountPercent) {
             revert JB721TiersHookStore_DiscountPercentIncreaseNotAllowed(discountPercent, storedTier.discountPercent);
         }
 

package/src/interfaces/IJB721TiersHookStore.sol

@@ -193,13 +193,14 @@ interface IJB721TiersHookStore {
     /// @param isOwnerMint Whether this is a direct owner mint.
     /// @return tokenIds The token IDs of the NFTs which were minted.
     /// @return leftoverAmount The amount remaining after minting.
+    /// @return restrictedCost Total cost of tiers with `cantBuyWithCredits` set.
     function recordMint(
         uint256 amount,
         uint16[] calldata tierIds,
         bool isOwnerMint
     )
         external
-        returns (uint256[] memory tokenIds, uint256 leftoverAmount);
+        returns (uint256[] memory tokenIds, uint256 leftoverAmount, uint256 restrictedCost);
 
     /// @notice Record reserve 721 minting for the provided tier ID.
     /// @param tierId The ID of the tier to mint reserves from.

package/src/structs/JB721Tier.sol

@@ -15,8 +15,9 @@ pragma solidity ^0.8.0;
 /// @custom:member discountPercent The discount that should be applied to the tier.
 /// @custom:member allowOwnerMint A boolean indicating whether the contract's owner can mint NFTs from this tier
 /// on-demand.
-/// @custom:member cannotBeRemoved A boolean indicating whether attempts to remove this tier will revert.
-/// @custom:member cannotIncreaseDiscountPercent If the tier cannot have its discount increased.
+/// @custom:member cantBeRemoved A boolean indicating whether attempts to remove this tier will revert.
+/// @custom:member cantIncreaseDiscountPercent If the tier cannot have its discount increased.
+/// @custom:member cantBuyWithCredits If true, this tier cannot be purchased using accumulated pay credits.
 /// @custom:member transfersPausable A boolean indicating whether transfers for NFTs in tier can be paused.
 /// @custom:member splitPercent The percentage of the tier's price that gets routed to the project's split group when
 /// an NFT from this tier is minted. Out of `JBConstants.SPLITS_TOTAL_PERCENT`.
@@ -37,8 +38,9 @@ struct JB721Tier {
     uint8 discountPercent;
     bool allowOwnerMint;
     bool transfersPausable;
-    bool cannotBeRemoved;
-    bool cannotIncreaseDiscountPercent;
+    bool cantBeRemoved;
+    bool cantIncreaseDiscountPercent;
+    bool cantBuyWithCredits;
     uint32 splitPercent;
     string resolvedUri;
 }

package/src/structs/JB721TierConfig.sol

@@ -24,8 +24,10 @@ import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 /// @custom:member transfersPausable A boolean indicating whether transfers for NFTs in tier can be paused.
 /// @custom:member useVotingUnits A boolean indicating whether the `votingUnits` should be used to calculate voting
 /// power. If `useVotingUnits` is false, voting power is based on the tier's price.
-/// @custom:member cannotBeRemoved If the tier cannot be removed once added.
+/// @custom:member cantBeRemoved If the tier cannot be removed once added.
 /// @custom:member cannotIncreaseDiscount If the tier cannot have its discount increased.
+/// @custom:member cantBuyWithCredits If true, this tier cannot be purchased using accumulated pay credits. Only fresh
+/// payment value counts toward this tier's price.
 /// @custom:member splitPercent The percentage of the tier's price that gets routed to the tier's split group when
 /// an NFT from this tier is minted. Out of `JBConstants.SPLITS_TOTAL_PERCENT`.
 /// @custom:member splits The splits to use for this tier's split group. These define where the split portion of the
@@ -45,8 +47,9 @@ struct JB721TierConfig {
     bool useReserveBeneficiaryAsDefault;
     bool transfersPausable;
     bool useVotingUnits;
-    bool cannotBeRemoved;
-    bool cannotIncreaseDiscountPercent;
+    bool cantBeRemoved;
+    bool cantIncreaseDiscountPercent;
+    bool cantBuyWithCredits;
     uint32 splitPercent;
     JBSplit[] splits;
 }

package/src/structs/JBStored721Tier.sol

@@ -12,7 +12,7 @@ pragma solidity ^0.8.0;
 /// tier. With a `reserveFrequency` of 5, an extra NFT will be minted for the `reserveBeneficiary` for every 5 NFTs
 /// purchased.
 /// @custom:member packedBools Packed boolean flags: allowOwnerMint, transfersPausable, useVotingUnits,
-/// cannotBeRemoved, cannotIncreaseDiscountPercent.
+/// cantBeRemoved, cantIncreaseDiscountPercent, cantBuyWithCredits.
 // forge-lint: disable-next-line(pascal-case-struct)
 struct JBStored721Tier {
     uint104 price;

package/test/721HookAttacks.t.sol

@@ -84,8 +84,9 @@ contract NFTHookAttacks is UnitTestSetup {
             allowOwnerMint: false,
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
@@ -115,7 +116,7 @@ contract NFTHookAttacks is UnitTestSetup {
     /// @notice Set discount to 100%, verify the effective price for the tier.
     function test_maxDiscountPercent_effectivePrice() public {
         defaultTierConfig.discountPercent = 0;
-        defaultTierConfig.cannotIncreaseDiscountPercent = false;
+        defaultTierConfig.cantIncreaseDiscountPercent = false;
 
         JB721TiersHook targetHook = _initHookDefaultTiers(1);
 
@@ -131,12 +132,12 @@ contract NFTHookAttacks is UnitTestSetup {
     }
 
     // =========================================================================
-    // Test 3: cannotIncreaseDiscountPercent flag enforcement
+    // Test 3: cantIncreaseDiscountPercent flag enforcement
     // =========================================================================
     /// @notice Try to increase discount when the flag forbids it.
-    function test_cannotIncreaseDiscountPercent_enforcement() public {
+    function test_cantIncreaseDiscountPercent_enforcement() public {
         defaultTierConfig.discountPercent = 10;
-        defaultTierConfig.cannotIncreaseDiscountPercent = true;
+        defaultTierConfig.cantIncreaseDiscountPercent = true;
 
         JB721TiersHook targetHook = _initHookDefaultTiers(1);
 
@@ -371,8 +372,9 @@ contract NFTHookAttacks is UnitTestSetup {
             allowOwnerMint: true,
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)

package/test/E2E/Pay_Mint_Redeem_E2E.t.sol

@@ -800,8 +800,9 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
                 useReserveBeneficiaryAsDefault: false,
                 transfersPausable: false,
                 useVotingUnits: false,
-                cannotBeRemoved: false,
-                cannotIncreaseDiscountPercent: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -892,8 +893,9 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });

package/test/Fork.t.sol

@@ -362,8 +362,9 @@ contract Fork_721Hook_Test is Test {
                 useReserveBeneficiaryAsDefault: false,
                 transfersPausable: false,
                 useVotingUnits: false,
-                cannotBeRemoved: false,
-                cannotIncreaseDiscountPercent: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -792,8 +793,9 @@ contract Fork_721Hook_Test is Test {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -824,8 +826,9 @@ contract Fork_721Hook_Test is Test {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -835,10 +838,10 @@ contract Fork_721Hook_Test is Test {
         IJB721TiersHook(hook).adjustTiers(newTiers, new uint256[](0));
     }
 
-    /// @notice cannotBeRemoved: removing an immutable tier should revert.
-    function test_fork_cannotBeRemoved_reverts() public {
+    /// @notice cantBeRemoved: removing an immutable tier should revert.
+    function test_fork_cantBeRemoved_reverts() public {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, false);
-        tierConfigs[0].cannotBeRemoved = true;
+        tierConfigs[0].cantBeRemoved = true;
         JB721TiersHookFlags memory flags = _defaultFlags();
         (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
@@ -899,11 +902,11 @@ contract Fork_721Hook_Test is Test {
         assertEq(IERC721(hook).balanceOf(beneficiary), 1, "NFT minted for free");
     }
 
-    /// @notice cannotIncreaseDiscountPercent: setting higher discount reverts.
+    /// @notice cantIncreaseDiscountPercent: setting higher discount reverts.
     function test_fork_cannotIncreaseDiscount() public {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, false);
         tierConfigs[0].discountPercent = 50;
-        tierConfigs[0].cannotIncreaseDiscountPercent = true;
+        tierConfigs[0].cantIncreaseDiscountPercent = true;
         JB721TiersHookFlags memory flags = _defaultFlags();
         (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
@@ -1131,8 +1134,9 @@ contract Fork_721Hook_Test is Test {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1524,8 +1528,9 @@ contract Fork_721Hook_Test is Test {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1770,8 +1775,9 @@ contract Fork_721Hook_Test is Test {
                 useReserveBeneficiaryAsDefault: false,
                 transfersPausable: false,
                 useVotingUnits: false,
-                cannotBeRemoved: false,
-                cannotIncreaseDiscountPercent: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -2045,8 +2051,9 @@ contract Fork_721Hook_Test is Test {
             useReserveBeneficiaryAsDefault: false,
             transfersPausable: false,
             useVotingUnits: false,
-            cannotBeRemoved: false,
-            cannotIncreaseDiscountPercent: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: splitPct,
             splits: splits
         });