@bananapus/721-hook-v6 0.0.9 → 0.0.11

package/README.md

@@ -222,7 +222,7 @@ Each pay/cash out hook can then execute custom behavior based on the custom data
 A project using a 721 tiers hook can specify any number of NFT tiers (up to 65,535 total).
 
 - NFT tiers can be removed by the project owner as long as they are not locked (`cannotBeRemoved`). After removing tiers, call `cleanTiers()` on the store to optimize tier iteration.
-- NFT tiers can be added by the project owner as long as they respect the hook's `flags`. The flags specify if newly added tiers can have votes (voting units), if new tiers can have non-zero reserve frequencies, if new tiers can allow on-demand minting by the project's owner, and if overspending is allowed.
+- NFT tiers can be added by the project owner as long as they respect the hook's `flags`. Tiers must be sorted by category in ascending order — the store reverts with `JB721TiersHookStore_InvalidCategorySortOrder` if not. The flags specify if newly added tiers can have votes (voting units), if new tiers can have non-zero reserve frequencies, if new tiers can allow on-demand minting by the project's owner, and if overspending is allowed.
 
 Each tier has the following properties:
 
@@ -235,8 +235,8 @@ Each tier has the following properties:
 - Voting units (optional). By default, each NFT's voting power equals its tier price. If `useVotingUnits` is true, a custom `votingUnits` value is used instead.
 - A flag to specify whether the NFTs in the tier can always be transferred, or if transfers can be paused depending on the project's ruleset.
 - A flag to specify whether the contract's owner can mint NFTs from the tier on-demand.
-- A split percent and a set of splits (optional). Each tier can route a percentage of its mint price to configured split recipients (other projects, addresses, etc.) every time an NFT from the tier is purchased. The remaining funds stay in the project's balance. The `splitPercent` is out of `JBConstants.SPLITS_TOTAL_PERCENT` (1,000,000,000).
-- A set of flags which restrict tiers added in the future (the votes/reserved frequency/on-demand minting/overspending flags noted above).
+- A split percent and a set of splits (optional). Each tier can route a percentage of its mint price to configured split recipients (other projects, addresses, etc.) every time an NFT from the tier is purchased. The remaining funds stay in the project's balance. The `splitPercent` is out of `JBConstants.SPLITS_TOTAL_PERCENT` (1,000,000,000). When splits are active, the hook adjusts the returned weight so the terminal only mints tokens proportional to the amount that actually enters the project treasury (e.g., a 50% split on a 1 ETH payment results in half the normal token issuance). This weight adjustment can be disabled with the `issueTokensForSplits` flag, which gives payers full token credit regardless of where the funds go.
+- A set of flags which restrict tiers added in the future (the votes/reserved frequency/on-demand minting/overspending/issueTokensForSplits flags noted above).
 
 Additional notes:
 

package/SKILLS.md

@@ -25,7 +25,7 @@ Tiered ERC-721 NFT hook for Juicebox V6 that mints NFTs when a project is paid a
 | `afterPayRecordedWith(context)` | `JB721Hook` | Called by terminal after payment. Validates caller is a project terminal, delegates to virtual `_processPayment`. |
 | `_processPayment(context)` | `JB721TiersHook` | Normalizes payment value via pricing context, decodes payer metadata for tier IDs to mint, calls `_mintAll`, manages pay credits for overspending. Distributes tier split funds via `JB721TiersHookLib.distributeAll` if split amounts were forwarded. |
 | `afterCashOutRecordedWith(context)` | `JB721Hook` | Called by terminal during cash out. Decodes token IDs from metadata, validates ownership, burns NFTs, delegates to virtual `_didBurn`. Reverts if `msg.value != 0`. |
-| `beforePayRecordedWith(context)` | `JB721TiersHook` | Data hook: returns original weight, calculates per-tier split amounts via `JB721TiersHookLib.calculateSplitAmounts`, and sets this contract as the pay hook with the total split amount forwarded. |
+| `beforePayRecordedWith(context)` | `JB721TiersHook` | Data hook: calculates per-tier split amounts via `JB721TiersHookLib.calculateSplitAmounts`, adjusts the weight proportionally so the terminal only mints tokens for the amount that actually enters the project (i.e., `weight = mulDiv(context.weight, amount - totalSplitAmount, amount)`), and sets this contract as the pay hook with the total split amount forwarded. If no splits, returns original weight unchanged. If splits consume the entire payment, returns weight 0. If the `issueTokensForSplits` flag is set, returns the full `context.weight` regardless of splits. |
 | `beforeCashOutRecordedWith(context)` | `JB721Hook` | Data hook: calculates `cashOutCount` (via virtual `cashOutWeightOf`) and `totalSupply` (via virtual `totalCashOutWeight`). Rejects if fungible tokens are also being cashed out. |
 | `adjustTiers(tiersToAdd, tierIdsToRemove)` | `JB721TiersHook` | Owner-only. Adds/removes tiers via `JB721TiersHookLib.adjustTiersFor` (DELEGATECALL). Requires `ADJUST_721_TIERS` permission. Registers tier splits in `JBSplits` if configured. |
 | `mintFor(tierIds, beneficiary)` | `JB721TiersHook` | Owner-only manual mint. Requires `MINT_721` permission. Passes `amount: type(uint256).max` and `isOwnerMint: true` to force the mint. |
@@ -86,7 +86,7 @@ Tiered ERC-721 NFT hook for Juicebox V6 that mints NFTs when a project is paid a
 | `JBStored721Tier` | `uint104 price`, `uint32 remainingSupply`, `uint32 initialSupply`, `uint32 splitPercent`, `uint24 category`, `uint8 discountPercent`, `uint16 reserveFrequency`, `uint8 packedBools` (allowOwnerMint, transfersPausable, useVotingUnits, cannotBeRemoved, cannotIncreaseDiscountPercent) | Internal storage in `JB721TiersHookStore`. Voting units stored separately in `_tierVotingUnitsOf` when `useVotingUnits` is true. |
 | `JB721InitTiersConfig` | `JB721TierConfig[] tiers`, `uint32 currency`, `uint8 decimals`, `IJBPrices prices` | `initialize` -- defines tiers and pricing context |
 | `JBDeploy721TiersHookConfig` | `string name`, `string symbol`, `string baseUri`, `IJB721TokenUriResolver tokenUriResolver`, `string contractUri`, `JB721InitTiersConfig tiersConfig`, `address reserveBeneficiary`, `JB721TiersHookFlags flags` | `deployHookFor`, `launchProjectFor` |
-| `JB721TiersHookFlags` | `bool noNewTiersWithReserves`, `bool noNewTiersWithVotes`, `bool noNewTiersWithOwnerMinting`, `bool preventOverspending` | `initialize`, `recordFlags` |
+| `JB721TiersHookFlags` | `bool noNewTiersWithReserves`, `bool noNewTiersWithVotes`, `bool noNewTiersWithOwnerMinting`, `bool preventOverspending`, `bool issueTokensForSplits` | `initialize`, `recordFlags` |
 | `JB721TiersRulesetMetadata` | `bool pauseTransfers`, `bool pauseMintPendingReserves` | Packed into `JBRulesetMetadata.metadata` per-ruleset (bit 0 = pauseTransfers, bit 1 = pauseMintPendingReserves) |
 | `JBPayDataHookRulesetConfig` | `uint48 mustStartAtOrAfter`, `uint32 duration`, `uint112 weight`, `uint32 weightCutPercent`, `IJBRulesetApprovalHook approvalHook`, `JBPayDataHookRulesetMetadata metadata`, `JBSplitGroup[] splitGroups`, `JBFundAccessLimitGroup[] fundAccessLimitGroups` | `JB721TiersHookProjectDeployer` -- wraps core ruleset config with `useDataHookForPay: true` hardcoded |
 | `JBPayDataHookRulesetMetadata` | Same as `JBRulesetMetadata` minus `allowSetCustomToken` (hardcoded false) and `useDataHookForPay` (hardcoded true) and `dataHook` (set to deployed hook). Includes `ownerMustSendPayouts`. | `launchProjectFor`, `launchRulesetsFor`, `queueRulesetsOf` |
@@ -138,7 +138,7 @@ Each tier has configurable voting power:
 - Each tier can route a percentage of its mint price to configured split recipients. The `splitPercent` field (out of `JBConstants.SPLITS_TOTAL_PERCENT` = 1,000,000,000) determines how much of the price is forwarded.
 - Split recipients are stored in `JBSplits` using group IDs computed as `uint256(uint160(hookAddress)) | (uint256(tierId) << 160)`.
 - Splits are registered via `JB721TiersHookLib._setSplitGroupsFor` when tiers with `splits` are added.
-- In `beforePayRecordedWith`, `calculateSplitAmounts` decodes tier IDs from payer metadata, computes `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, and returns the total to be forwarded to the hook.
+- In `beforePayRecordedWith`, `calculateSplitAmounts` decodes tier IDs from payer metadata, computes `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, and returns the total to be forwarded to the hook. The weight is adjusted down proportionally unless the `issueTokensForSplits` flag is set, in which case the full `context.weight` is returned.
 - In `afterPayRecordedWith`, `distributeAll` distributes forwarded funds to each tier's split group recipients. Leftover after all splits goes back to the project's balance via `addToBalance`.
 - Split recipients can be projects (via `terminal.pay` or `terminal.addToBalance`) or plain addresses (direct ETH transfer or `SafeERC20.safeTransfer`). Splits with no `projectId` and no `beneficiary` are skipped -- their share stays in the leftover and is routed to the project's own balance via `addToBalanceOf`, preventing a misconfigured split from bricking the payout distribution.
 
@@ -169,6 +169,8 @@ Each tier has configurable voting power:
 - **Max initial supply per tier is 999,999,999** (`_ONE_BILLION - 1`). Exceeding this would cause token ID overflow into the next tier's ID space.
 - **`noNewTiersWithVotes` blocks all voting power**: It rejects tiers where voting units would be non-zero, whether from custom `votingUnits` or from a non-zero `price` (when `useVotingUnits` is false).
 - **`firstOwnerOf` is lazy**: The first owner is only stored when the token is first transferred away from its original holder. Before any transfer, `firstOwnerOf` returns the current owner.
+- **Tiers must be sorted by category, NOT price.** `recordAddTiers` reverts with `JB721TiersHookStore_InvalidCategorySortOrder` if tiers aren't in ascending category order. The `JB721InitTiersConfig` struct comment previously said "sorted by price" but the code enforces category ordering. Within the same category, tiers can be in any order.
+- **Always use `JB721TiersHookProjectDeployer.launchProjectFor` even without NFTs.** Pass an empty tiers array to enable future NFT additions without migration. If a project is launched via `JBController.launchProjectFor` instead, adding NFT tiers later requires wiring a new data hook into a new ruleset — using the 721 deployer from the start avoids this.
 
 ## Example Integration
 
@@ -223,7 +225,8 @@ tiers[0] = JB721TierConfig({
             noNewTiersWithReserves: false,
             noNewTiersWithVotes: false,
             noNewTiersWithOwnerMinting: false,
-            preventOverspending: false
+            preventOverspending: false,
+            issueTokensForSplits: false
         })
     }),
     launchProjectConfig: launchConfig,  // JBLaunchProjectConfig with rulesets, terminals, etc.

package/docs/src/src/JB721TiersHookStore.sol/contract.JB721TiersHookStore.md

@@ -167,7 +167,7 @@ mapping(address hook => mapping(uint256 tierId => JBStored721Tier)) internal _st
 
 
 ### _tierIdAfter
-Returns the ID of the tier which comes after the provided tier ID (sorted by price).
+Returns the ID of the tier which comes after the provided tier ID (sorted by category).
 
 *If empty, assume the next tier ID should come after.*
 
@@ -386,7 +386,7 @@ function tiersOf(
 |`hook`|`address`|The 721 contract to get the tiers of.|
 |`categories`|`uint256[]`|An array tier categories to get tiers from. Send an empty array to get all categories.|
 |`includeResolvedUri`|`bool`|If set to `true`, if the contract has a token URI resolver, its content will be resolved and included.|
-|`startingId`|`uint256`|The ID of the first tier to get (sorted by price). Send 0 to get all active tiers.|
+|`startingId`|`uint256`|The ID of the first tier to get (sorted by category). Send 0 to get all active tiers.|
 |`size`|`uint256`|The number of tiers to include.|
 
 **Returns**
@@ -561,7 +561,7 @@ function totalCashOutWeight(address hook) public view override returns (uint256
 
 ### _firstSortedTierIdOf
 
-Get the first tier ID from an 721 contract (when sorted by price) within a provided category.
+Get the first tier ID from an 721 contract (when sorted by category) within a provided category.
 
 
 ```solidity
@@ -669,7 +669,7 @@ function _isTierRemovedWithRefresh(
 
 ### _lastSortedTierIdOf
 
-The last sorted tier ID from an 721 contract (when sorted by price).
+The last sorted tier ID from an 721 contract (when sorted by category).
 
 
 ```solidity
@@ -690,7 +690,7 @@ function _lastSortedTierIdOf(address hook) internal view returns (uint256 id);
 
 ### _nextSortedTierIdOf
 
-Get the tier ID which comes after the provided one when sorted by price.
+Get the tier ID which comes after the provided one when sorted by category.
 
 
 ```solidity

package/docs/src/src/structs/JB721InitTiersConfig.sol/struct.JB721InitTiersConfig.md

@@ -3,7 +3,7 @@
 
 Config to initialize a `JB721TiersHook` with tiers and price data.
 
-*The `tiers` must be sorted by price (from least to greatest).*
+*The `tiers` must be sorted by category (from least to greatest).*
 
 **Notes:**
 - member: tiers The tiers to initialize the hook with.

package/foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
 solc = '0.8.26'
 evm_version = 'paris'
-optimizer_runs = 800
+optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@bananapus/address-registry-v6": "^0.0.4",
-    "@bananapus/core-v6": "^0.0.9",
-    "@bananapus/ownable-v6": "^0.0.5",
-    "@bananapus/permission-ids-v6": "^0.0.4",
+    "@bananapus/core-v6": "^0.0.10",
+    "@bananapus/ownable-v6": "^0.0.6",
+    "@bananapus/permission-ids-v6": "^0.0.5",
     "@openzeppelin/contracts": "5.2.0",
     "@prb/math": "^4.1.0",
     "solady": "^0.1.8"

package/src/JB721TiersHook.sol

@@ -22,13 +22,14 @@ import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "./interfaces/IJB721TokenUriResolver.sol";
 import {JB721TiersHookLib} from "./libraries/JB721TiersHookLib.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 import {JB721TiersRulesetMetadataResolver} from "./libraries/JB721TiersRulesetMetadataResolver.sol";
+import {JB721InitTiersConfig} from "./structs/JB721InitTiersConfig.sol";
 import {JB721Tier} from "./structs/JB721Tier.sol";
 import {JB721TierConfig} from "./structs/JB721TierConfig.sol";
-import {JB721TiersSetDiscountPercentConfig} from "./structs/JB721TiersSetDiscountPercentConfig.sol";
-import {JB721InitTiersConfig} from "./structs/JB721InitTiersConfig.sol";
 import {JB721TiersHookFlags} from "./structs/JB721TiersHookFlags.sol";
 import {JB721TiersMintReservesConfig} from "./structs/JB721TiersMintReservesConfig.sol";
+import {JB721TiersSetDiscountPercentConfig} from "./structs/JB721TiersSetDiscountPercentConfig.sol";
 
 /// @title JB721TiersHook
 /// @notice A Juicebox project can use this hook to sell tiered ERC-721 NFTs with different prices and metadata. When
@@ -162,7 +163,8 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @notice The data calculated before a payment is recorded in the terminal store.
     /// @dev Overrides the base to calculate the split amount to forward based on tier split percentages.
     /// @param context The payment context.
-    /// @return weight The weight to use for token minting (unchanged from ruleset weight).
+    /// @return weight The weight to use for token minting, adjusted down when tier splits route funds away from the
+    /// project (unless `issueTokensForSplits` is set).
     /// @return hookSpecifications The hook specifications, with the split amount to forward.
     function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
         public
@@ -171,13 +173,24 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         override(JB721Hook, IJBRulesetDataHook)
         returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
     {
-        weight = context.weight;
         hookSpecifications = new JBPayHookSpecification[](1);
 
         // Calculate per-tier split amounts via the library.
         (uint256 totalSplitAmount, bytes memory splitMetadata) =
             JB721TiersHookLib.calculateSplitAmounts(STORE, address(this), METADATA_ID_TARGET, context.metadata);
 
+        // Adjust weight so the terminal mints tokens only for the amount that actually enters the project.
+        if (totalSplitAmount == 0 || STORE.flagsOf(address(this)).issueTokensForSplits) {
+            // No splits, or hook configured to give full token credit regardless — full weight.
+            weight = context.weight;
+        } else if (context.amount.value > totalSplitAmount) {
+            // Partial splits — scale weight by the fraction that enters the project.
+            weight = mulDiv(context.weight, context.amount.value - totalSplitAmount, context.amount.value);
+        } else {
+            // Splits consume the entire payment — no tokens should be minted.
+            weight = 0;
+        }
+
         hookSpecifications[0] = JBPayHookSpecification({hook: this, amount: totalSplitAmount, metadata: splitMetadata});
     }
 
@@ -190,13 +203,6 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         return STORE.cashOutWeightOf({hook: address(this), tokenIds: tokenIds});
     }
 
-    /// @notice Indicates if this contract adheres to the specified interface.
-    /// @dev See {IERC165-supportsInterface}.
-    /// @param interfaceId The ID of the interface to check for adherence to.
-    function supportsInterface(bytes4 interfaceId) public view override(IERC165, JB721Hook) returns (bool) {
-        return interfaceId == type(IJB721TiersHook).interfaceId || JB721Hook.supportsInterface(interfaceId);
-    }
-
     /// @notice Initializes a cloned copy of the original hook contract.
     /// @param projectId The ID of the project this this hook is associated with.
     /// @param name The name of the NFT collection.
@@ -262,13 +268,20 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         // Set the flags if needed.
         if (
             flags.noNewTiersWithReserves || flags.noNewTiersWithVotes || flags.noNewTiersWithOwnerMinting
-                || flags.preventOverspending
+                || flags.preventOverspending || flags.issueTokensForSplits
         ) STORE.recordFlags(flags);
 
         // Transfer ownership to the initializer.
         _transferOwnership(_msgSender());
     }
 
+    /// @notice Indicates if this contract adheres to the specified interface.
+    /// @dev See {IERC165-supportsInterface}.
+    /// @param interfaceId The ID of the interface to check for adherence to.
+    function supportsInterface(bytes4 interfaceId) public view override(IERC165, JB721Hook) returns (bool) {
+        return interfaceId == type(IJB721TiersHook).interfaceId || JB721Hook.supportsInterface(interfaceId);
+    }
+
     /// @notice The metadata URI of the NFT with the specified token ID.
     /// @dev Defers to the `tokenUriResolver` if it is set. Otherwise, use the `tokenUri` corresponding with the NFT's
     /// tier.

package/src/JB721TiersHookDeployer.sol

@@ -3,12 +3,12 @@ pragma solidity 0.8.26;
 
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
-import {LibClone} from "solady/src/utils/LibClone.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {LibClone} from "solady/src/utils/LibClone.sol";
 
 import {JB721TiersHook} from "./JB721TiersHook.sol";
-import {IJB721TiersHookDeployer} from "./interfaces/IJB721TiersHookDeployer.sol";
 import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
+import {IJB721TiersHookDeployer} from "./interfaces/IJB721TiersHookDeployer.sol";
 import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 import {JBDeploy721TiersHookConfig} from "./structs/JBDeploy721TiersHookConfig.sol";
 

package/src/JB721TiersHookProjectDeployer.sol

@@ -13,14 +13,14 @@ import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 
+import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "./interfaces/IJB721TiersHookDeployer.sol";
 import {IJB721TiersHookProjectDeployer} from "./interfaces/IJB721TiersHookProjectDeployer.sol";
-import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
 import {JBDeploy721TiersHookConfig} from "./structs/JBDeploy721TiersHookConfig.sol";
-import {JBLaunchRulesetsConfig} from "./structs/JBLaunchRulesetsConfig.sol";
-import {JBQueueRulesetsConfig} from "./structs/JBQueueRulesetsConfig.sol";
 import {JBLaunchProjectConfig} from "./structs/JBLaunchProjectConfig.sol";
+import {JBLaunchRulesetsConfig} from "./structs/JBLaunchRulesetsConfig.sol";
 import {JBPayDataHookRulesetConfig} from "./structs/JBPayDataHookRulesetConfig.sol";
+import {JBQueueRulesetsConfig} from "./structs/JBQueueRulesetsConfig.sol";
 
 /// @title JB721TiersHookProjectDeployer
 /// @notice Deploys a project and a 721 tiers hook for it. Can be used to queue rulesets for the project if given
@@ -195,6 +195,27 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
         });
     }
 
+    //*********************************************************************//
+    // -------------------------- internal views ------------------------- //
+    //*********************************************************************//
+
+    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
+    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
+        return ERC2771Context._contextSuffixLength();
+    }
+
+    /// @notice The calldata. Preferred to use over `msg.data`.
+    /// @return calldata The `msg.data` of this call.
+    function _msgData() internal view override(ERC2771Context, Context) returns (bytes calldata) {
+        return ERC2771Context._msgData();
+    }
+
+    /// @notice The message's sender. Preferred to use over `msg.sender`.
+    /// @return sender The address which sent this call.
+    function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
+        return ERC2771Context._msgSender();
+    }
+
     //*********************************************************************//
     // ------------------------ internal functions ----------------------- //
     //*********************************************************************//
@@ -393,21 +414,4 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
             projectId: projectId, rulesetConfigurations: rulesetConfigurations, memo: queueRulesetsConfig.memo
         });
     }
-
-    /// @notice The calldata. Preferred to use over `msg.data`.
-    /// @return calldata The `msg.data` of this call.
-    function _msgData() internal view override(ERC2771Context, Context) returns (bytes calldata) {
-        return ERC2771Context._msgData();
-    }
-
-    /// @notice The message's sender. Preferred to use over `msg.sender`.
-    /// @return sender The address which sent this call.
-    function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
-        return ERC2771Context._msgSender();
-    }
-
-    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
-    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
-        return ERC2771Context._contextSuffixLength();
-    }
 }

package/src/JB721TiersHookStore.sol

@@ -132,7 +132,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     /// @custom:returns The stored tier, as a `JBStored721Tier` struct.
     mapping(address hook => mapping(uint256 tierId => JBStored721Tier)) internal _storedTierOf;
 
-    /// @notice Returns the ID of the tier which comes after the provided tier ID (sorted by price).
+    /// @notice Returns the ID of the tier which comes after the provided tier ID (sorted by category).
     /// @dev If empty, assume the next tier ID should come after.
     /// @custom:param hook The address of the 721 contract to get the next tier ID from.
     /// @custom:param tierId The ID of the tier to get the next tier ID in relation to.
@@ -247,7 +247,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     /// @param categories An array tier categories to get tiers from. Send an empty array to get all categories.
     /// @param includeResolvedUri If set to `true`, if the contract has a token URI resolver, its content will be
     /// resolved and included.
-    /// @param startingId The ID of the first tier to get (sorted by price). Send 0 to get all active tiers.
+    /// @param startingId The ID of the first tier to get (sorted by category). Send 0 to get all active tiers.
     /// @param size The number of tiers to include.
     /// @return tiers An array of active 721 tiers.
     function tiersOf(
@@ -383,18 +383,6 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
 
-    /// @notice Get the tier with the provided ID from the provided 721 contract.
-    /// @param hook The 721 contract to get the tier from.
-    /// @param id The ID of the tier to get.
-    /// @param includeResolvedUri If set to `true`, if the contract has a token URI resolver, its content will be
-    /// resolved and included.
-    /// @return The tier.
-    function tierOf(address hook, uint256 id, bool includeResolvedUri) public view override returns (JB721Tier memory) {
-        return _getTierFrom({
-            hook: hook, tierId: id, storedTier: _storedTierOf[hook][id], includeResolvedUri: includeResolvedUri
-        });
-    }
-
     /// @notice Get the number of NFTs that the specified address has from the specified 721 contract (across all
     /// tiers).
     /// @param hook The 721 contract to get the balance within.
@@ -454,6 +442,18 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         return tokenId / _ONE_BILLION;
     }
 
+    /// @notice Get the tier with the provided ID from the provided 721 contract.
+    /// @param hook The 721 contract to get the tier from.
+    /// @param id The ID of the tier to get.
+    /// @param includeResolvedUri If set to `true`, if the contract has a token URI resolver, its content will be
+    /// resolved and included.
+    /// @return The tier.
+    function tierOf(address hook, uint256 id, bool includeResolvedUri) public view override returns (JB721Tier memory) {
+        return _getTierFrom({
+            hook: hook, tierId: id, storedTier: _storedTierOf[hook][id], includeResolvedUri: includeResolvedUri
+        });
+    }
+
     /// @notice The combined cash out weight for all NFTs from the provided 721 contract.
     /// @param hook The 721 contract to get the total cash out weight of.
     /// @return weight The total cash out weight.
@@ -482,7 +482,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     // -------------------------- internal views ------------------------- //
     //*********************************************************************//
 
-    /// @notice Get the first tier ID from an 721 contract (when sorted by price) within a provided category.
+    /// @notice Get the first tier ID from an 721 contract (when sorted by category) within a provided category.
     /// @param hook The 721 contract to get the first sorted tier ID of.
     /// @param category The category to get the first sorted tier ID within. Send 0 for the first ID across all tiers,
     /// which might not be in the 0th category if the 0th category does not exist.
@@ -578,7 +578,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         return bitmapWord.isTierIdRemoved(tierId);
     }
 
-    /// @notice The last sorted tier ID from an 721 contract (when sorted by price).
+    /// @notice The last sorted tier ID from an 721 contract (when sorted by category).
     /// @param hook The 721 contract to get the last sorted tier ID of.
     /// @return id The last sorted tier ID.
     function _lastSortedTierIdOf(address hook) internal view returns (uint256 id) {
@@ -587,7 +587,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
         if (id == 0) id = maxTierIdOf[hook];
     }
 
-    /// @notice Get the tier ID which comes after the provided one when sorted by price.
+    /// @notice Get the tier ID which comes after the provided one when sorted by category.
     /// @param hook The 721 contract to get the next sorted tier ID from.
     /// @param id The tier ID to get the next sorted tier ID relative to.
     /// @param max The maximum tier ID.
@@ -782,7 +782,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             revert JB721TiersHookStore_MaxTiersExceeded(currentMaxTierIdOf + tiersToAdd.length, type(uint16).max);
         }
 
-        // Keep a reference to the current last sorted tier ID (sorted by price).
+        // Keep a reference to the current last sorted tier ID (sorted by category).
         uint256 currentLastSortedTierId = _lastSortedTierIdOf(msg.sender);
 
         // Initialize an array for the new tier IDs to be returned.

package/src/abstract/JB721Hook.sol

@@ -17,8 +17,8 @@ import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {ERC721} from "./ERC721.sol";
 import {IJB721Hook} from "../interfaces/IJB721Hook.sol";
+import {ERC721} from "./ERC721.sol";
 
 /// @title JB721Hook
 /// @notice When a project which uses this hook is paid, this hook may mint NFTs to the payer, depending on this hook's
@@ -68,26 +68,6 @@ abstract contract JB721Hook is ERC721, IJB721Hook {
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice The data calculated before a payment is recorded in the terminal store. This data is provided to the
-    /// terminal's `pay(...)` transaction.
-    /// @dev Sets this contract as the pay hook. Part of `IJBRulesetDataHook`.
-    /// @param context The payment context passed to this contract by the `pay(...)` function.
-    /// @return weight The new `weight` to use, overriding the ruleset's `weight`.
-    /// @return hookSpecifications The amount and data to send to pay hooks (this contract) instead of adding to the
-    /// terminal's balance.
-    function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
-        public
-        view
-        virtual
-        override
-        returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
-    {
-        // Forward the received weight and use this contract as the only pay hook.
-        weight = context.weight;
-        hookSpecifications = new JBPayHookSpecification[](1);
-        hookSpecifications[0] = JBPayHookSpecification({hook: this, amount: 0, metadata: bytes("")});
-    }
-
     /// @notice The data calculated before a cash out is recorded in the terminal store. This data is provided to the
     /// terminal's `cashOutTokensOf(...)` transaction.
     /// @dev Sets this contract as the cash out hook. Part of `IJBRulesetDataHook`.
@@ -138,6 +118,26 @@ abstract contract JB721Hook is ERC721, IJB721Hook {
         cashOutTaxRate = context.cashOutTaxRate;
     }
 
+    /// @notice The data calculated before a payment is recorded in the terminal store. This data is provided to the
+    /// terminal's `pay(...)` transaction.
+    /// @dev Sets this contract as the pay hook. Part of `IJBRulesetDataHook`.
+    /// @param context The payment context passed to this contract by the `pay(...)` function.
+    /// @return weight The new `weight` to use, overriding the ruleset's `weight`.
+    /// @return hookSpecifications The amount and data to send to pay hooks (this contract) instead of adding to the
+    /// terminal's balance.
+    function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
+        public
+        view
+        virtual
+        override
+        returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
+    {
+        // Forward the received weight and use this contract as the only pay hook.
+        weight = context.weight;
+        hookSpecifications = new JBPayHookSpecification[](1);
+        hookSpecifications[0] = JBPayHookSpecification({hook: this, amount: 0, metadata: bytes("")});
+    }
+
     /// @notice Required by the IJBRulesetDataHook interfaces. Return false to not leak any permissions.
     function hasMintPermissionFor(uint256, JBRuleset memory, address) external pure returns (bool) {
         return false;
@@ -175,24 +175,6 @@ abstract contract JB721Hook is ERC721, IJB721Hook {
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
-    /// @notice Mints one or more NFTs to the `context.beneficiary` upon payment if conditions are met. Part of
-    /// `IJBPayHook`.
-    /// @dev Reverts if the calling contract is not one of the project's terminals.
-    /// @param context The payment context passed in by the terminal.
-    // slither-disable-next-line locked-ether
-    function afterPayRecordedWith(JBAfterPayRecordedContext calldata context) external payable virtual override {
-        uint256 projectId = PROJECT_ID;
-
-        // Make sure the caller is a terminal of the project, and that the call is being made on behalf of an
-        // interaction with the correct project.
-        if (!DIRECTORY.isTerminalOf(projectId, IJBTerminal(msg.sender)) || context.projectId != projectId) {
-            revert JB721Hook_InvalidPay();
-        }
-
-        // Process the payment.
-        _processPayment(context);
-    }
-
     /// @notice Burns the specified NFTs upon token holder cash out, reclaiming funds from the project's balance for
     /// `context.beneficiary`. Part of `IJBCashOutHook`.
     /// @dev Reverts if the calling contract is not one of the project's terminals.
@@ -241,10 +223,32 @@ abstract contract JB721Hook is ERC721, IJB721Hook {
         _didBurn(decodedTokenIds);
     }
 
+    /// @notice Mints one or more NFTs to the `context.beneficiary` upon payment if conditions are met. Part of
+    /// `IJBPayHook`.
+    /// @dev Reverts if the calling contract is not one of the project's terminals.
+    /// @param context The payment context passed in by the terminal.
+    // slither-disable-next-line locked-ether
+    function afterPayRecordedWith(JBAfterPayRecordedContext calldata context) external payable virtual override {
+        uint256 projectId = PROJECT_ID;
+
+        // Make sure the caller is a terminal of the project, and that the call is being made on behalf of an
+        // interaction with the correct project.
+        if (!DIRECTORY.isTerminalOf(projectId, IJBTerminal(msg.sender)) || context.projectId != projectId) {
+            revert JB721Hook_InvalidPay();
+        }
+
+        // Process the payment.
+        _processPayment(context);
+    }
+
     //*********************************************************************//
-    // ---------------------- internal transactions ---------------------- //
+    // ------------------------ internal functions ----------------------- //
     //*********************************************************************//
 
+    /// @notice Executes after NFTs have been burned via cash out.
+    /// @param tokenIds The token IDs of the NFTs that were burned.
+    function _didBurn(uint256[] memory tokenIds) internal virtual;
+
     /// @notice Initializes the contract by associating it with a project and adding ERC721 details.
     /// @param projectId The ID of the project that this contract is associated with.
     /// @param name The name of the NFT collection.
@@ -254,10 +258,6 @@ abstract contract JB721Hook is ERC721, IJB721Hook {
         PROJECT_ID = projectId;
     }
 
-    /// @notice Executes after NFTs have been burned via cash out.
-    /// @param tokenIds The token IDs of the NFTs that were burned.
-    function _didBurn(uint256[] memory tokenIds) internal virtual;
-
     /// @notice Process a received payment.
     /// @param context The payment context passed in by the terminal.
     function _processPayment(JBAfterPayRecordedContext calldata context) internal virtual;

package/src/interfaces/IJB721Hook.sol

@@ -6,6 +6,7 @@ import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPayHook} from "@bananapus/core-v6/src/interfaces/IJBPayHook.sol";
 import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 
+/// @notice A 721 hook that integrates with Juicebox as a data hook, pay hook, and cash out hook.
 interface IJB721Hook is IJBRulesetDataHook, IJBPayHook, IJBCashOutHook {
     /// @notice The directory of terminals and controllers for projects.
     /// @return The directory contract.

package/src/interfaces/IJB721TiersHook.sol

@@ -13,11 +13,29 @@ import {JB721TiersHookFlags} from "../structs/JB721TiersHookFlags.sol";
 import {JB721TiersMintReservesConfig} from "../structs/JB721TiersMintReservesConfig.sol";
 import {JB721TiersSetDiscountPercentConfig} from "../structs/JB721TiersSetDiscountPercentConfig.sol";
 
+/// @notice A 721 tiers hook that mints tiered NFTs for payments and tracks their cash out weight.
 interface IJB721TiersHook is IJB721Hook {
+    /// @notice Emitted when pay credits are added for an account.
+    /// @param amount The amount of credits added.
+    /// @param newTotalCredits The new total credits balance for the account.
+    /// @param account The account that received the credits.
+    /// @param caller The address that called the function.
     event AddPayCredits(
         uint256 indexed amount, uint256 indexed newTotalCredits, address indexed account, address caller
     );
+
+    /// @notice Emitted when a new tier is added.
+    /// @param tierId The ID of the tier that was added.
+    /// @param tier The configuration of the tier that was added.
+    /// @param caller The address that called the function.
     event AddTier(uint256 indexed tierId, JB721TierConfig tier, address caller);
+
+    /// @notice Emitted when an NFT is minted from a payment.
+    /// @param tokenId The token ID of the minted NFT.
+    /// @param tierId The ID of the tier the NFT was minted from.
+    /// @param beneficiary The address that received the NFT.
+    /// @param totalAmountPaid The total amount paid in the transaction.
+    /// @param caller The address that called the function.
     event Mint(
         uint256 indexed tokenId,
         uint256 indexed tierId,
@@ -25,25 +43,55 @@ interface IJB721TiersHook is IJB721Hook {
         uint256 totalAmountPaid,
         address caller
     );
+
+    /// @notice Emitted when a reserved NFT is minted.
+    /// @param tokenId The token ID of the minted reserved NFT.
+    /// @param tierId The ID of the tier the reserved NFT was minted from.
+    /// @param beneficiary The address that received the reserved NFT.
+    /// @param caller The address that called the function.
     event MintReservedNft(uint256 indexed tokenId, uint256 indexed tierId, address indexed beneficiary, address caller);
+
+    /// @notice Emitted when a tier is removed.
+    /// @param tierId The ID of the tier that was removed.
+    /// @param caller The address that called the function.
     event RemoveTier(uint256 indexed tierId, address caller);
+
+    /// @notice Emitted when the base URI is set.
+    /// @param baseUri The new base URI.
+    /// @param caller The address that called the function.
     event SetBaseUri(string indexed baseUri, address caller);
+
+    /// @notice Emitted when the contract URI is set.
+    /// @param uri The new contract URI.
+    /// @param caller The address that called the function.
     event SetContractUri(string indexed uri, address caller);
+
+    /// @notice Emitted when a tier's discount percent is set.
+    /// @param tierId The ID of the tier whose discount percent was set.
+    /// @param discountPercent The new discount percent.
+    /// @param caller The address that called the function.
     event SetDiscountPercent(uint256 indexed tierId, uint256 discountPercent, address caller);
+
+    /// @notice Emitted when a tier's encoded IPFS URI is set.
+    /// @param tierId The ID of the tier whose encoded IPFS URI was set.
+    /// @param encodedUri The new encoded IPFS URI.
+    /// @param caller The address that called the function.
     event SetEncodedIPFSUri(uint256 indexed tierId, bytes32 encodedUri, address caller);
+
+    /// @notice Emitted when the token URI resolver is set.
+    /// @param resolver The new token URI resolver.
+    /// @param caller The address that called the function.
     event SetTokenUriResolver(IJB721TokenUriResolver indexed resolver, address caller);
+
+    /// @notice Emitted when pay credits are used by an account.
+    /// @param amount The amount of credits used.
+    /// @param newTotalCredits The new total credits balance for the account.
+    /// @param account The account that used the credits.
+    /// @param caller The address that called the function.
     event UsePayCredits(
         uint256 indexed amount, uint256 indexed newTotalCredits, address indexed account, address caller
     );
 
-    /// @notice The contract storing and managing project rulesets.
-    /// @return The rulesets contract.
-    function RULESETS() external view returns (IJBRulesets);
-
-    /// @notice The contract that stores and manages data for this contract's NFTs.
-    /// @return The store contract.
-    function STORE() external view returns (IJB721TiersHookStore);
-
     /// @notice The base URI for the NFT `tokenUris`.
     /// @return The base URI string.
     function baseURI() external view returns (string memory);
@@ -68,6 +116,14 @@ interface IJB721TiersHook is IJB721Hook {
     /// @return prices The prices contract used to resolve the value of payments in other currencies.
     function pricingContext() external view returns (uint256 currency, uint256 decimals, IJBPrices prices);
 
+    /// @notice The contract storing and managing project rulesets.
+    /// @return The rulesets contract.
+    function RULESETS() external view returns (IJBRulesets);
+
+    /// @notice The contract that stores and manages data for this contract's NFTs.
+    /// @return The store contract.
+    function STORE() external view returns (IJB721TiersHookStore);
+
     /// @notice Add or remove tiers.
     /// @param tiersToAdd The tiers to add, as an array of `JB721TierConfig` structs.
     /// @param tierIdsToRemove The tiers to remove, as an array of tier IDs.
@@ -94,15 +150,6 @@ interface IJB721TiersHook is IJB721Hook {
     )
         external;
 
-    /// @notice Set the discount percent for a tier.
-    /// @param tierId The ID of the tier to set the discount of.
-    /// @param discountPercent The discount percent to set.
-    function setDiscountPercentOf(uint256 tierId, uint256 discountPercent) external;
-
-    /// @notice Set the discount percent for multiple tiers.
-    /// @param configs The configs to set the discount percent for.
-    function setDiscountPercentsOf(JB721TiersSetDiscountPercentConfig[] calldata configs) external;
-
     /// @notice Manually mint NFTs from the provided tiers.
     /// @param tierIds The IDs of the tiers to mint from.
     /// @param beneficiary The address to mint to.
@@ -118,6 +165,15 @@ interface IJB721TiersHook is IJB721Hook {
     /// @param count The number of reserved NFTs to mint.
     function mintPendingReservesFor(uint256 tierId, uint256 count) external;
 
+    /// @notice Set the discount percent for a tier.
+    /// @param tierId The ID of the tier to set the discount of.
+    /// @param discountPercent The discount percent to set.
+    function setDiscountPercentOf(uint256 tierId, uint256 discountPercent) external;
+
+    /// @notice Set the discount percent for multiple tiers.
+    /// @param configs The configs to set the discount percent for.
+    function setDiscountPercentsOf(JB721TiersSetDiscountPercentConfig[] calldata configs) external;
+
     /// @notice Update this hook's URI metadata properties.
     /// @param baseUri The new base URI.
     /// @param contractUri The new contract URI.

package/src/interfaces/IJB721TiersHookDeployer.sol

@@ -4,7 +4,12 @@ pragma solidity ^0.8.0;
 import {IJB721TiersHook} from "./IJB721TiersHook.sol";
 import {JBDeploy721TiersHookConfig} from "../structs/JBDeploy721TiersHookConfig.sol";
 
+/// @notice Deploys 721 tiers hooks for projects.
 interface IJB721TiersHookDeployer {
+    /// @notice Emitted when a 721 tiers hook is deployed for a project.
+    /// @param projectId The ID of the project the hook was deployed for.
+    /// @param hook The deployed hook contract.
+    /// @param caller The address that called the function.
     event HookDeployed(uint256 indexed projectId, IJB721TiersHook hook, address caller);
 
     /// @notice Deploys a 721 tiers hook for the specified project.

package/src/interfaces/IJB721TiersHookProjectDeployer.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 
 import {IJB721TiersHook} from "./IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "./IJB721TiersHookDeployer.sol";
@@ -11,6 +11,7 @@ import {JBLaunchProjectConfig} from "../structs/JBLaunchProjectConfig.sol";
 import {JBLaunchRulesetsConfig} from "../structs/JBLaunchRulesetsConfig.sol";
 import {JBQueueRulesetsConfig} from "../structs/JBQueueRulesetsConfig.sol";
 
+/// @notice Deploys projects with 721 tiers hooks attached.
 interface IJB721TiersHookProjectDeployer {
     /// @notice The directory of terminals and controllers for projects.
     /// @return The directory contract.

package/src/interfaces/IJB721TiersHookStore.sol

@@ -6,7 +6,11 @@ import {JB721Tier} from "../structs/JB721Tier.sol";
 import {JB721TierConfig} from "../structs/JB721TierConfig.sol";
 import {JB721TiersHookFlags} from "../structs/JB721TiersHookFlags.sol";
 
+/// @notice Stores and manages data for 721 tiers hooks.
 interface IJB721TiersHookStore {
+    /// @notice Emitted when removed tiers are cleaned from the sorting sequence.
+    /// @param hook The 721 contract whose tiers were cleaned.
+    /// @param caller The address that called the function.
     event CleanTiers(address indexed hook, address caller);
 
     /// @notice Emitted when the default reserve beneficiary is changed.

package/src/interfaces/IJB721TokenUriResolver.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+/// @notice Resolves token URIs for 721 NFTs.
 interface IJB721TokenUriResolver {
     /// @notice Resolve the token URI for the given NFT.
     /// @param nft The address of the NFT contract.

package/src/structs/JB721InitTiersConfig.sol

@@ -6,7 +6,7 @@ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {JB721TierConfig} from "./JB721TierConfig.sol";
 
 /// @notice Config to initialize a `JB721TiersHook` with tiers and price data.
-/// @dev The `tiers` must be sorted by price (from least to greatest).
+/// @dev The `tiers` must be sorted by category (from least to greatest).
 /// @custom:member tiers The tiers to initialize the hook with.
 /// @custom:member currency The currency that the tier prices are denoted in. See `JBPrices`.
 /// @custom:member decimals The number of decimals in the fixed point tier prices.

package/src/structs/JB721TiersHookFlags.sol

@@ -9,9 +9,12 @@ pragma solidity ^0.8.0;
 /// `allowOwnerMint` set to true will revert.
 /// @custom:member preventOverspending A boolean indicating whether payments attempting to spend more than the price of
 /// the NFTs being minted will revert.
+/// @custom:member issueTokensForSplits A boolean indicating whether payers receive token credit for the portion of
+/// their payment that is routed to tier splits. When false (default), weight is reduced proportionally.
 struct JB721TiersHookFlags {
     bool noNewTiersWithReserves;
     bool noNewTiersWithVotes;
     bool noNewTiersWithOwnerMinting;
     bool preventOverspending;
+    bool issueTokensForSplits;
 }

package/test/E2E/Pay_Mint_Redeem_E2E.t.sol

@@ -798,6 +798,7 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
             reserveBeneficiary: reserveBeneficiary,
             flags: JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -891,6 +892,7 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
             reserveBeneficiary: reserveBeneficiary,
             flags: JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true

package/test/regression/L34_ReserveBeneficiaryOverwrite.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import "../utils/UnitTestSetup.sol";
 import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
 
-/// @notice Regression test for L-34: defaultReserveBeneficiaryOf is globally overwritten when adding a tier with
+/// @notice defaultReserveBeneficiaryOf is globally overwritten when adding a tier with
 /// useReserveBeneficiaryAsDefault=true.
 contract Test_L34_ReserveBeneficiaryOverwrite is UnitTestSetup {
     using stdStorage for StdStorage;

package/test/regression/L35_CacheTierLookup.t.sol

@@ -5,13 +5,13 @@ import "../utils/UnitTestSetup.sol";
 import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
 import {JB721TiersHookLib} from "../../src/libraries/JB721TiersHookLib.sol";
 
-/// @notice Regression test for L-35: calculateSplitAmounts cached the tierOf result to avoid a duplicate external call.
+/// @notice calculateSplitAmounts caches the tierOf result to avoid a duplicate external call.
 /// Verifies that the cached tier lookup returns the same split amounts as reading price and splitPercent individually.
 contract Test_L35_CacheTierLookup is UnitTestSetup {
     using stdStorage for StdStorage;
 
     /// @notice Verify that calculateSplitAmounts returns correct per-tier amounts when multiple tiers have different
-    /// prices and split percentages. This exercises the cached `tier` variable introduced by L-35.
+    /// prices and split percentages. This exercises the cached `tier` variable.
     function test_calculateSplitAmounts_multiTier_correctAmounts() public {
         ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
         IJB721TiersHookStore hookStore = testHook.STORE();

package/test/regression/L36_SplitNoBeneficiary.t.sol

@@ -10,7 +10,7 @@ import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 
-/// @notice Regression test for L-36: Split with no beneficiary and no projectId should route funds to the project's
+/// @notice Split with no beneficiary and no projectId should route funds to the project's
 /// balance instead of silently dropping them.
 contract Test_L36_SplitNoBeneficiary is UnitTestSetup {
     using stdStorage for StdStorage;

package/test/unit/adjustTier_Unit.t.sol

@@ -585,6 +585,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -715,6 +716,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             }),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -904,6 +906,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: true,
                 noNewTiersWithOwnerMinting: true
@@ -1023,6 +1026,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: true, // <-- This is the flag we're testing.
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -1141,6 +1145,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             }),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -1213,6 +1218,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -1359,6 +1365,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: true, // <-- This is the flag we're testing.
                 noNewTiersWithOwnerMinting: true
@@ -1444,6 +1451,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: true, // <-- This is the flag we're testing.
                 noNewTiersWithOwnerMinting: true
@@ -1578,6 +1586,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             IJB721TiersHookStore(address(store)),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -1686,6 +1695,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             }),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true
@@ -1762,6 +1772,7 @@ contract Test_adjustTier_Unit is UnitTestSetup {
             }),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: false,
                 noNewTiersWithVotes: false,
                 noNewTiersWithOwnerMinting: true

package/test/unit/getters_constructor_Unit.t.sol

@@ -38,6 +38,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
             address(0),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: true,
                 noNewTiersWithVotes: true,
                 noNewTiersWithOwnerMinting: true
@@ -544,6 +545,7 @@ contract Test_Getters_Constructor_Unit is UnitTestSetup {
             }),
             JB721TiersHookFlags({
                 preventOverspending: false,
+                issueTokensForSplits: false,
                 noNewTiersWithReserves: true,
                 noNewTiersWithVotes: true,
                 noNewTiersWithOwnerMinting: true

package/test/unit/tierSplitRouting_Unit.t.sol

@@ -7,6 +7,7 @@ import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
 import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {JB721TiersHookFlags} from "../../src/structs/JB721TiersHookFlags.sol";
 
 contract Test_TierSplitRouting is UnitTestSetup {
     using stdStorage for StdStorage;
@@ -91,8 +92,8 @@ contract Test_TierSplitRouting is UnitTestSetup {
 
         (uint256 weight, JBPayHookSpecification[] memory specs) = testHook.beforePayRecordedWith(context);
 
-        // Weight unchanged.
-        assertEq(weight, 10e18);
+        // Weight adjusted for 50% split: 10e18 * 0.5 = 5e18.
+        assertEq(weight, 5e18);
         // Hook spec should forward 50% of 1 ETH = 0.5 ETH.
         assertEq(specs.length, 1);
         assertEq(specs[0].amount, 0.5 ether);
@@ -184,6 +185,121 @@ contract Test_TierSplitRouting is UnitTestSetup {
         assertEq(specs[0].amount, 2.3 ether);
     }
 
+    // ──────────────────────────────────────────────
+    // Test: weight adjusted for splits
+    // ──────────────────────────────────────────────
+
+    function test_beforePayRecorded_weightAdjustedForSplits() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+        IJB721TiersHookStore hookStore = testHook.STORE();
+
+        // Add a tier with 30% split.
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = _tierConfigWithSplit(1 ether, 300_000_000); // 30%
+        vm.prank(address(testHook));
+        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
+
+        uint16[] memory mintIds = new uint16[](1);
+        mintIds[0] = uint16(tierIds[0]);
+        bytes memory payerMetadata = _buildPayerMetadata(address(testHook), mintIds);
+
+        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
+            terminal: mockTerminalAddress,
+            payer: beneficiary,
+            amount: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 1 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            projectId: projectId,
+            rulesetId: 0,
+            beneficiary: beneficiary,
+            weight: 10e18,
+            reservedPercent: 5000,
+            metadata: payerMetadata
+        });
+
+        (uint256 weight,) = testHook.beforePayRecordedWith(context);
+
+        // Weight adjusted for 30% split: 10e18 * 0.7 = 7e18.
+        assertEq(weight, 7e18);
+    }
+
+    function test_beforePayRecorded_noSplitPercent_weightUnchanged() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+        IJB721TiersHookStore hookStore = testHook.STORE();
+
+        // Add a tier with 0% split.
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = _tierConfigWithSplit(1 ether, 0);
+        vm.prank(address(testHook));
+        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
+
+        uint16[] memory mintIds = new uint16[](1);
+        mintIds[0] = uint16(tierIds[0]);
+        bytes memory payerMetadata = _buildPayerMetadata(address(testHook), mintIds);
+
+        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
+            terminal: mockTerminalAddress,
+            payer: beneficiary,
+            amount: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 1 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            projectId: projectId,
+            rulesetId: 0,
+            beneficiary: beneficiary,
+            weight: 10e18,
+            reservedPercent: 5000,
+            metadata: payerMetadata
+        });
+
+        (uint256 weight,) = testHook.beforePayRecordedWith(context);
+
+        // No split = weight unchanged.
+        assertEq(weight, 10e18);
+    }
+
+    function test_beforePayRecorded_fullSplitPercent_weightZero() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+        IJB721TiersHookStore hookStore = testHook.STORE();
+
+        // Add a tier with 100% split, priced at full payment amount.
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = _tierConfigWithSplit(1 ether, 1_000_000_000); // 100%
+        vm.prank(address(testHook));
+        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
+
+        uint16[] memory mintIds = new uint16[](1);
+        mintIds[0] = uint16(tierIds[0]);
+        bytes memory payerMetadata = _buildPayerMetadata(address(testHook), mintIds);
+
+        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
+            terminal: mockTerminalAddress,
+            payer: beneficiary,
+            amount: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 1 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            projectId: projectId,
+            rulesetId: 0,
+            beneficiary: beneficiary,
+            weight: 10e18,
+            reservedPercent: 5000,
+            metadata: payerMetadata
+        });
+
+        (uint256 weight,) = testHook.beforePayRecordedWith(context);
+
+        // 100% split of full amount = weight 0.
+        assertEq(weight, 0);
+    }
+
     // ──────────────────────────────────────────────
     // Test: afterPayRecordedWith distributes to split beneficiary
     // ──────────────────────────────────────────────
@@ -272,4 +388,110 @@ contract Test_TierSplitRouting is UnitTestSetup {
         // NFT should have been minted.
         assertEq(testHook.balanceOf(beneficiary), 1);
     }
+
+    // ──────────────────────────────────────────────
+    // Test: issueTokensForSplits flag gives full weight with partial splits
+    // ──────────────────────────────────────────────
+
+    function test_beforePayRecorded_issueTokensForSplits_fullWeight() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+        IJB721TiersHookStore hookStore = testHook.STORE();
+
+        // Set the issueTokensForSplits flag.
+        vm.prank(address(testHook));
+        hookStore.recordFlags(
+            JB721TiersHookFlags({
+                noNewTiersWithReserves: false,
+                noNewTiersWithVotes: false,
+                noNewTiersWithOwnerMinting: false,
+                preventOverspending: false,
+                issueTokensForSplits: true
+            })
+        );
+
+        // Add a tier with 50% split.
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = _tierConfigWithSplit(1 ether, 500_000_000); // 50%
+        vm.prank(address(testHook));
+        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
+
+        uint16[] memory mintIds = new uint16[](1);
+        mintIds[0] = uint16(tierIds[0]);
+        bytes memory payerMetadata = _buildPayerMetadata(address(testHook), mintIds);
+
+        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
+            terminal: mockTerminalAddress,
+            payer: beneficiary,
+            amount: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 1 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            projectId: projectId,
+            rulesetId: 0,
+            beneficiary: beneficiary,
+            weight: 10e18,
+            reservedPercent: 5000,
+            metadata: payerMetadata
+        });
+
+        (uint256 weight,) = testHook.beforePayRecordedWith(context);
+
+        // Flag set — weight should be full despite 50% split.
+        assertEq(weight, 10e18);
+    }
+
+    // ──────────────────────────────────────────────
+    // Test: issueTokensForSplits flag gives full weight even when splits consume entire payment
+    // ──────────────────────────────────────────────
+
+    function test_beforePayRecorded_issueTokensForSplits_fullSplit_stillFullWeight() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+        IJB721TiersHookStore hookStore = testHook.STORE();
+
+        // Set the issueTokensForSplits flag.
+        vm.prank(address(testHook));
+        hookStore.recordFlags(
+            JB721TiersHookFlags({
+                noNewTiersWithReserves: false,
+                noNewTiersWithVotes: false,
+                noNewTiersWithOwnerMinting: false,
+                preventOverspending: false,
+                issueTokensForSplits: true
+            })
+        );
+
+        // Add a tier with 100% split, priced at full payment amount.
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = _tierConfigWithSplit(1 ether, 1_000_000_000); // 100%
+        vm.prank(address(testHook));
+        uint256[] memory tierIds = hookStore.recordAddTiers(tierConfigs);
+
+        uint16[] memory mintIds = new uint16[](1);
+        mintIds[0] = uint16(tierIds[0]);
+        bytes memory payerMetadata = _buildPayerMetadata(address(testHook), mintIds);
+
+        JBBeforePayRecordedContext memory context = JBBeforePayRecordedContext({
+            terminal: mockTerminalAddress,
+            payer: beneficiary,
+            amount: JBTokenAmount({
+                token: JBConstants.NATIVE_TOKEN,
+                value: 1 ether,
+                decimals: 18,
+                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+            }),
+            projectId: projectId,
+            rulesetId: 0,
+            beneficiary: beneficiary,
+            weight: 10e18,
+            reservedPercent: 5000,
+            metadata: payerMetadata
+        });
+
+        (uint256 weight,) = testHook.beforePayRecordedWith(context);
+
+        // Flag set — weight should be full despite 100% split consuming entire payment.
+        assertEq(weight, 10e18);
+    }
 }