@bananapus/721-hook-v6 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "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),
+            cannotBeRemoved: (packed & 0x8 != 0),
+            cannotIncreaseDiscountPercent: (packed & 0x10 != 0),
+            cantBuyWithCredits: (packed & 0x20 != 0),
             splitPercent: storedTier.splitPercent,
             resolvedUri: !includeResolvedUri || tokenUriResolverOf[hook] == IJB721TokenUriResolver(address(0))
                 ? ""
@@ -680,13 +676,15 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     /// @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 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 cannotIncreaseDiscountPercent,
+        bool cantBuyWithCredits
     )
         internal
         pure
@@ -698,16 +696,18 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             packed := or(shl(0x2, useVotingUnits), packed)
             packed := or(shl(0x3, cannotBeRemoved), packed)
             packed := or(shl(0x4, cannotIncreaseDiscountPercent), 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 cantBuyWithCredits Whether or not the tier cannot be purchased using accumulated pay credits.
     function _unpackBools(uint8 packed)
         internal
         pure
@@ -716,7 +716,8 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             bool transfersPausable,
             bool useVotingUnits,
             bool cannotBeRemoved,
-            bool cannotIncreaseDiscountPercent
+            bool cannotIncreaseDiscountPercent,
+            bool cantBuyWithCredits
         )
     {
         assembly {
@@ -725,6 +726,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             useVotingUnits := iszero(iszero(and(0x4, packed)))
             cannotBeRemoved := iszero(iszero(and(0x8, packed)))
             cannotIncreaseDiscountPercent := iszero(iszero(and(0x10, packed)))
+            cantBuyWithCredits := iszero(iszero(and(0x20, packed)))
         }
     }
 
@@ -907,7 +909,8 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
                     transfersPausable: tierToAdd.transfersPausable,
                     useVotingUnits: tierToAdd.useVotingUnits,
                     cannotBeRemoved: tierToAdd.cannotBeRemoved,
-                    cannotIncreaseDiscountPercent: tierToAdd.cannotIncreaseDiscountPercent
+                    cannotIncreaseDiscountPercent: tierToAdd.cannotIncreaseDiscountPercent,
+                    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,7 +1199,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             JBStored721Tier storage storedTier = _storedTierOf[msg.sender][tierId];
 
             // Parse the flags.
-            (,,, bool cannotBeRemoved,) = _unpackBools(storedTier.packedBools);
+            (,,, bool cannotBeRemoved,,) = _unpackBools(storedTier.packedBools);
 
             // Make sure the tier can be removed.
             if (cannotBeRemoved) revert JB721TiersHookStore_CantRemoveTier(tierId);
@@ -1217,7 +1228,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         JBStored721Tier storage storedTier = _storedTierOf[msg.sender][tierId];
 
         // Parse the flags.
-        (,,,, bool cannotIncreaseDiscountPercent) = _unpackBools(storedTier.packedBools);
+        (,,,, bool cannotIncreaseDiscountPercent,) = _unpackBools(storedTier.packedBools);
 
         // Make sure that increasing the discount is allowed for the tier.
         if (discountPercent > storedTier.discountPercent && cannotIncreaseDiscountPercent) {

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/libraries/JB721TiersHookLib.sol

@@ -214,7 +214,7 @@ library JB721TiersHookLib {
         }
 
         if (splitTierCount != 0) {
-            assembly {
+            assembly ("memory-safe") {
                 mstore(splitTierIds, splitTierCount)
                 mstore(splitAmounts, splitTierCount)
             }

package/src/structs/JB721Tier.sol

@@ -17,6 +17,7 @@ pragma solidity ^0.8.0;
 /// 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 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`.
@@ -39,6 +40,7 @@ struct JB721Tier {
     bool transfersPausable;
     bool cannotBeRemoved;
     bool cannotIncreaseDiscountPercent;
+    bool cantBuyWithCredits;
     uint32 splitPercent;
     string resolvedUri;
 }

package/src/structs/JB721TierConfig.sol

@@ -26,6 +26,8 @@ import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 /// 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 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
@@ -47,6 +49,7 @@ struct JB721TierConfig {
     bool useVotingUnits;
     bool cannotBeRemoved;
     bool cannotIncreaseDiscountPercent;
+    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.
+/// cannotBeRemoved, cannotIncreaseDiscountPercent, cantBuyWithCredits.
 // forge-lint: disable-next-line(pascal-case-struct)
 struct JBStored721Tier {
     uint104 price;

package/test/721HookAttacks.t.sol

@@ -86,6 +86,7 @@ contract NFTHookAttacks is UnitTestSetup {
             transfersPausable: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
@@ -373,6 +374,7 @@ contract NFTHookAttacks is UnitTestSetup {
             transfersPausable: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)

package/test/E2E/Pay_Mint_Redeem_E2E.t.sol

@@ -802,6 +802,7 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -894,6 +895,7 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });

package/test/Fork.t.sol

@@ -364,6 +364,7 @@ contract Fork_721Hook_Test is Test {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -794,6 +795,7 @@ contract Fork_721Hook_Test is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -826,6 +828,7 @@ contract Fork_721Hook_Test is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1133,6 +1136,7 @@ contract Fork_721Hook_Test is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1526,6 +1530,7 @@ contract Fork_721Hook_Test is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1772,6 +1777,7 @@ contract Fork_721Hook_Test is Test {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -2047,6 +2053,7 @@ contract Fork_721Hook_Test is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: splitPct,
             splits: splits
         });

package/test/TestAuditGaps.sol

@@ -455,6 +455,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -508,6 +509,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -563,6 +565,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -664,6 +667,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -713,6 +717,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -774,6 +779,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -846,6 +852,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
@@ -1041,6 +1048,7 @@ contract TestAuditGaps_GasLimits is UnitTestSetup {
                 transfersPausable: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 useVotingUnits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)

package/test/TestVotingUnitsLifecycle.t.sol

@@ -281,7 +281,7 @@ contract TestVotingUnitsLifecycle is UnitTestSetup {
                     reserveFrequency: uint16(0),
                     category: uint24(100),
                     discountPercent: uint8(0),
-                    packedBools: testHook.test_store().ForTest_packBools(true, false, false, false, false),
+                    packedBools: testHook.test_store().ForTest_packBools(true, false, false, false, false, false),
                     splitPercent: 0
                 })
             );

package/test/audit/CodexPayCreditsBypassTierSplits.t.sol

@@ -123,6 +123,7 @@ contract CodexPayCreditsBypassTierSplits is UnitTestSetup {
             transfersPausable: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 1_000_000_000,
             splits: new JBSplit[](0)

package/test/audit/CodexSplitCreditsMismatch.t.sol

@@ -126,6 +126,7 @@ contract CodexSplitCreditsMismatch is UnitTestSetup {
             transfersPausable: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             useVotingUnits: false,
             splitPercent: 1_000_000_000,
             splits: new JBSplit[](0)

package/test/fork/ERC20CashOutFork.t.sol

@@ -355,6 +355,7 @@ contract ERC20CashOutFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -440,6 +441,7 @@ contract ERC20CashOutFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -526,6 +528,7 @@ contract ERC20CashOutFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -545,6 +548,7 @@ contract ERC20CashOutFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });

package/test/fork/ERC20TierSplitFork.t.sol

@@ -408,6 +408,7 @@ contract ERC20TierSplitFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 300_000_000, // 30%
             splits: splits
         });
@@ -477,6 +478,7 @@ contract ERC20TierSplitFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 300_000_000, // 30%
             splits: splits
         });
@@ -544,6 +546,7 @@ contract ERC20TierSplitFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 500_000_000, // 50%
             splits: splits
         });

package/test/fork/IssueTokensForSplitsFork.t.sol

@@ -355,6 +355,7 @@ contract IssueTokensForSplitsFork is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: splitPercent,
             splits: splits
         });

package/test/invariants/handlers/TierLifecycleHandler.sol

@@ -129,7 +129,7 @@ contract TierLifecycleHandler is Test {
         tierIds[0] = uint16(tierId);
 
         vm.prank(hookAddress);
-        try store.recordMint(tierPrice, tierIds, false) returns (uint256[] memory tokenIds, uint256) {
+        try store.recordMint(tierPrice, tierIds, false) returns (uint256[] memory tokenIds, uint256, uint256) {
             // Track minted tokens
             for (uint256 i = 0; i < tokenIds.length; i++) {
                 _actorTokenIds[actor].push(tokenIds[i]);
@@ -195,6 +195,7 @@ contract TierLifecycleHandler is Test {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -268,7 +269,7 @@ contract TierLifecycleHandler is Test {
         tierIds[0] = uint16(tierId);
 
         vm.prank(hookAddress);
-        try store.recordMint(0, tierIds, true) returns (uint256[] memory tokenIds, uint256) {
+        try store.recordMint(0, tierIds, true) returns (uint256[] memory tokenIds, uint256, uint256) {
             address actor = _getActor(seed);
             for (uint256 i = 0; i < tokenIds.length; i++) {
                 _actorTokenIds[actor].push(tokenIds[i]);

package/test/invariants/handlers/TierStoreHandler.sol

@@ -65,6 +65,7 @@ contract TierStoreHandler is CommonBase, StdCheats, StdUtils {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -122,7 +123,7 @@ contract TierStoreHandler is CommonBase, StdCheats, StdUtils {
 
     /// @dev External wrapper for calldata.
     function _doMint(uint256 amount, uint16[] calldata tierIds) external returns (uint256[] memory tokenIds) {
-        (tokenIds,) = STORE.recordMint(amount, tierIds, true);
+        (tokenIds,,) = STORE.recordMint(amount, tierIds, true);
     }
 
     /// @notice Burn a minted token.

package/test/regression/ProjectDeployerRulesets.t.sol

@@ -125,6 +125,7 @@ contract Test_ProjectDeployerRulesets is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });

package/test/unit/AuditFixes_Unit.t.sol

@@ -475,6 +475,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -493,6 +494,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -511,6 +513,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
             useVotingUnits: false,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -579,6 +582,7 @@ contract Test_AuditFixes_Unit is UnitTestSetup {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });

package/test/unit/adjustTier_Unit.t.sol

@@ -551,6 +551,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -570,6 +571,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -684,6 +686,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -703,6 +706,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -753,6 +757,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                     useVotingUnits: true,
                     cannotBeRemoved: false,
                     cannotIncreaseDiscountPercent: false,
+                    cantBuyWithCredits: false,
                     splitPercent: 0,
                     splits: new JBSplit[](0)
                 });
@@ -772,6 +777,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                     transfersPausable: tierConfigsRemaining[arrayIndex].transfersPausable,
                     cannotBeRemoved: tierConfigsRemaining[arrayIndex].cannotBeRemoved,
                     cannotIncreaseDiscountPercent: tierConfigsRemaining[arrayIndex].cannotIncreaseDiscountPercent,
+                    cantBuyWithCredits: tierConfigsRemaining[arrayIndex].cantBuyWithCredits,
                     splitPercent: 0,
                     resolvedUri: ""
                 });
@@ -804,6 +810,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -822,6 +829,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigsToAdd[i].transfersPausable,
                 cannotBeRemoved: tierConfigsToAdd[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigsToAdd[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigsToAdd[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -880,6 +888,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -899,6 +908,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -948,6 +958,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -966,6 +977,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigsToAdd[i].transfersPausable,
                 cannotBeRemoved: tierConfigsToAdd[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigsToAdd[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigsToAdd[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1008,6 +1020,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1027,6 +1040,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1075,6 +1089,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1093,6 +1108,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigsToAdd[i].transfersPausable,
                 cannotBeRemoved: tierConfigsToAdd[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigsToAdd[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigsToAdd[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1130,6 +1146,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: true,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1148,6 +1165,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: false,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1204,6 +1222,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1223,6 +1242,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1270,6 +1290,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1288,6 +1309,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigsToAdd[i].transfersPausable,
                 cannotBeRemoved: tierConfigsToAdd[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigsToAdd[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigsToAdd[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1332,6 +1354,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 cannotBeRemoved: false,
                 useVotingUnits: true,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1375,6 +1398,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1424,6 +1448,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: false, // <-- If false, voting power is based on tier price
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1467,6 +1492,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1516,6 +1542,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: true, // <-- If false, voting power is based on tier price
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1591,6 +1618,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 useVotingUnits: false,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });
@@ -1610,6 +1638,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
                 transfersPausable: tierConfigs[i].transfersPausable,
                 cannotBeRemoved: tierConfigs[i].cannotBeRemoved,
                 cannotIncreaseDiscountPercent: tierConfigs[i].cannotIncreaseDiscountPercent,
+                cantBuyWithCredits: tierConfigs[i].cantBuyWithCredits,
                 splitPercent: 0,
                 resolvedUri: ""
             });
@@ -1720,6 +1749,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: true,
             cannotIncreaseDiscountPercent: true,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1775,6 +1805,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: true,
             cannotIncreaseDiscountPercent: true,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });
@@ -1793,6 +1824,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             useVotingUnits: true,
             cannotBeRemoved: true,
             cannotIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false,
             splitPercent: 0,
             splits: new JBSplit[](0)
         });

package/test/unit/getters_constructor_Unit.t.sol

@@ -46,16 +46,17 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
         assertEq(decimals2, uint256(decimals));
     }
 
-    function test_bools_doesPackingAndUnpackingWork(bool a, bool b, bool c, bool d, bool e) public {
+    function test_bools_doesPackingAndUnpackingWork(bool a, bool b, bool c, bool d, bool e, bool f) public {
         ForTest_JB721TiersHookStore store = new ForTest_JB721TiersHookStore();
-        uint8 packed = store.ForTest_packBools(a, b, c, d, e);
-        (bool a2, bool b2, bool c2, bool d2, bool e2) = store.ForTest_unpackBools(packed);
+        uint8 packed = store.ForTest_packBools(a, b, c, d, e, f);
+        (bool a2, bool b2, bool c2, bool d2, bool e2, bool f2) = store.ForTest_unpackBools(packed);
         // Check: do the packed values match the unpacked values?
         assertEq(a, a2);
         assertEq(b, b2);
         assertEq(c, c2);
         assertEq(d, d2);
         assertEq(e, e2);
+        assertEq(f, f2);
     }
 
     function test_tiersOf_returnsAllTiersWithResolver(uint256 numberOfTiers) public {
@@ -154,6 +155,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                     transfersPausable: false,
                     cannotBeRemoved: false,
                     cannotIncreaseDiscountPercent: false,
+                    cantBuyWithCredits: false,
                     splitPercent: 0,
                     resolvedUri: ""
                 })
@@ -181,7 +183,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(0),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -238,7 +240,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -280,7 +282,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                     reserveFrequency: uint16(100),
                     category: uint24(100),
                     discountPercent: uint8(0),
-                    packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                    packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                     splitPercent: 0
                 })
             );
@@ -441,7 +443,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(0),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -550,6 +552,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
                 useVotingUnits: true,
                 cannotBeRemoved: false,
                 cannotIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false,
                 splitPercent: 0,
                 splits: new JBSplit[](0)
             });

package/test/unit/mintFor_mintReservesFor_Unit.t.sol

@@ -36,7 +36,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -86,7 +86,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                     reserveFrequency: uint16(reserveFrequency),
                     category: uint24(100),
                     discountPercent: uint8(0),
-                    packedBools: hook.test_store().ForTest_packBools(true, false, true, false, false),
+                    packedBools: hook.test_store().ForTest_packBools(true, false, true, false, false, false),
                     splitPercent: 0
                 })
             );
@@ -193,7 +193,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -295,7 +295,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -336,7 +336,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -387,7 +387,7 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
                         reserveFrequency: uint16(reserveFrequency),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
                         splitPercent: 0
                     })
                 );

package/test/unit/redeem_Unit.t.sol

@@ -28,7 +28,7 @@ contract Test_cashOut_Unit is UnitTestSetup {
                         reserveFrequency: uint16(0),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -103,7 +103,7 @@ contract Test_cashOut_Unit is UnitTestSetup {
                         reserveFrequency: uint16(0),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );
@@ -164,7 +164,7 @@ contract Test_cashOut_Unit is UnitTestSetup {
                         reserveFrequency: uint16(0),
                         category: uint24(100),
                         discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false),
+                        packedBools: hook.test_store().ForTest_packBools(false, false, false, false, false, false),
                         splitPercent: 0
                     })
                 );