@bananapus/721-hook-v6 0.0.40 → 0.0.41

package/package.json

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

package/src/JB721TiersHook.sol

@@ -7,7 +7,6 @@ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 import {IJBRulesets} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
 import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
 import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
 import {JBAfterPayRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterPayRecordedContext.sol";
 import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
@@ -24,7 +23,6 @@ import {IJB721CheckpointsDeployer} from "./interfaces/IJB721CheckpointsDeployer.
 import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "./interfaces/IJB721TokenUriResolver.sol";
-import {JB721Constants} from "./libraries/JB721Constants.sol";
 import {JB721TiersHookLib} from "./libraries/JB721TiersHookLib.sol";
 import {JB721TiersRulesetMetadataResolver} from "./libraries/JB721TiersRulesetMetadataResolver.sol";
 import {JB721InitTiersConfig} from "./structs/JB721InitTiersConfig.sol";
@@ -206,19 +204,21 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         uint256 totalSplitAmount;
         bytes memory splitMetadata;
         address beneficiary;
-        (weight, totalSplitAmount, splitMetadata, beneficiary) = JB721TiersHookLib.computeSplitsAndWeight({
-            store: STORE,
-            metadataIdTarget: METADATA_ID_TARGET,
-            packedPricingContext: _packedPricingContext,
-            prices: PRICES,
-            context: context
-        });
+        uint256 splitCreditWeight;
+        (weight, totalSplitAmount, splitMetadata, beneficiary, splitCreditWeight) =
+            JB721TiersHookLib.computeSplitsAndWeight({
+                store: STORE,
+                metadataIdTarget: METADATA_ID_TARGET,
+                packedPricingContext: _packedPricingContext,
+                prices: PRICES,
+                context: context
+            });
 
         hookSpecifications[0] = JBPayHookSpecification({
             hook: this,
             noop: false,
             amount: totalSplitAmount,
-            metadata: abi.encode(beneficiary, context.payer, splitMetadata)
+            metadata: abi.encode(beneficiary, context.payer, splitMetadata, splitCreditWeight)
         });
     }
 

package/src/JB721TiersHookStore.sol

@@ -36,6 +36,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
     error JB721TiersHookStore_InvalidQuantity(uint256 quantity, uint256 limit);
     error JB721TiersHookStore_ManualMintingNotAllowed(uint256 tierId);
     error JB721TiersHookStore_MaxTiersExceeded(uint256 numberOfTiers, uint256 limit);
+    error JB721TiersHookStore_MissingReserveBeneficiary(uint256 tierId);
     error JB721TiersHookStore_PriceExceedsAmount(uint256 price, uint256 leftoverAmount);
     error JB721TiersHookStore_ReserveFrequencyNotAllowed(uint256 tierId);
     error JB721TiersHookStore_SplitPercentExceedsBounds(uint256 percent, uint256 limit);
@@ -724,6 +725,9 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
                 || reserveBeneficiaryOf({hook: hook, tierId: tierId}) == address(0)
         ) return 0;
 
+        // A sold-out tier cannot have mintable pending reserves — minting would underflow remainingSupply.
+        if (storedTier.remainingSupply == 0) return 0;
+
         // The number of reserve NFTs which have already been minted from the tier.
         uint256 numberOfReserveMints = numberOfReservesMintedFor[hook][tierId];
 
@@ -976,6 +980,15 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
                 revert JB721TiersHookStore_DeadlockedReserve();
             }
 
+            // A tier with reserves must have a beneficiary — either tier-specific or a previously set default.
+            // Without one, minted reserves would be sent to address(0).
+            if (
+                tierToAdd.reserveFrequency > 0 && tierToAdd.reserveBeneficiary == address(0)
+                    && defaultReserveBeneficiaryOf[msg.sender] == address(0)
+            ) {
+                revert JB721TiersHookStore_MissingReserveBeneficiary(tierId);
+            }
+
             // Store the tier with that ID.
             _storedTierOf[msg.sender][tierId] = JBStored721Tier({
                 price: uint104(tierToAdd.price),

package/src/interfaces/IJB721TiersHook.sol

@@ -7,7 +7,6 @@ import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
 import {IJB721Checkpoints} from "./IJB721Checkpoints.sol";
-import {IJB721CheckpointsDeployer} from "./IJB721CheckpointsDeployer.sol";
 import {IJB721Hook} from "./IJB721Hook.sol";
 import {IJB721TiersHookStore} from "./IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "./IJB721TokenUriResolver.sol";

package/src/libraries/JB721TiersHookLib.sol

@@ -309,6 +309,8 @@ library JB721TiersHookLib {
     /// @return totalSplitAmount The total amount to forward for splits.
     /// @return splitMetadata Encoded per-tier breakdown (tierIds, amounts).
     /// @return beneficiary The resolved beneficiary address.
+    /// @return splitCreditWeight The weight attributable to tier splits when `issueTokensForSplits` is true.
+    /// Zero when splits are absent or `issueTokensForSplits` is false.
     function computeSplitsAndWeight(
         IJB721TiersHookStore store,
         address metadataIdTarget,
@@ -318,7 +320,13 @@ library JB721TiersHookLib {
     )
         external
         view
-        returns (uint256 weight, uint256 totalSplitAmount, bytes memory splitMetadata, address beneficiary)
+        returns (
+            uint256 weight,
+            uint256 totalSplitAmount,
+            bytes memory splitMetadata,
+            address beneficiary,
+            uint256 splitCreditWeight
+        )
     {
         // Calculate per-tier split amounts.
         (totalSplitAmount, splitMetadata) = _calculateSplitAmounts({
@@ -346,6 +354,13 @@ library JB721TiersHookLib {
             hook: address(this)
         });
 
+        // When issueTokensForSplits is true and there are splits, compute the weight portion
+        // attributable to tier splits. Downstream compositors (e.g. JBOmnichainDeployer) use this
+        // to preserve split credit when an extra hook (buyback) returns weight=0.
+        if (totalSplitAmount != 0 && context.amount.value != 0 && store.flagsOf(address(this)).issueTokensForSplits) {
+            splitCreditWeight = mulDiv(context.weight, totalSplitAmount, context.amount.value);
+        }
+
         // Resolve the effective beneficiary from payment metadata.
         beneficiary = context.beneficiary;
         {

package/test/audit/{CodexNemesisFreshAudit.t.sol → FreshAudit.t.sol}

@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
 import {UnitTestSetup} from "../utils/UnitTestSetup.sol";
 import {ForTest_JB721TiersHook} from "../utils/ForTest_JB721TiersHook.sol";
 import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
+import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
 import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
@@ -16,7 +17,7 @@ import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 
-contract CodexNemesisFreshAudit is UnitTestSetup {
+contract FreshAudit is UnitTestSetup {
     function _buildPayMetadata(
         address hookAddress,
         bool allowOverspending,
@@ -158,16 +159,10 @@ contract CodexNemesisFreshAudit is UnitTestSetup {
         assertEq(hookStore.totalCashOutWeight(address(testHook)), 1 ether, "full-price NFT still enters cash-out math");
     }
 
+    /// @notice Creating a tier with reserveFrequency > 0 and no beneficiary (tier-specific or default)
+    /// is now rejected at creation time, preventing the retroactive dilution bug.
     function test_new_default_reserve_beneficiary_retroactively_dilutes_existing_tiers() public {
         ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
-        IJB721TiersHookStore hookStore = testHook.STORE();
-        address retroReserveBeneficiary = makeAddr("retroReserveBeneficiary");
-
-        vm.mockCall(
-            mockJBDirectory,
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
 
         JB721TierConfig[] memory initialTier = new JB721TierConfig[](1);
         initialTier[0] = JB721TierConfig({
@@ -192,81 +187,11 @@ contract CodexNemesisFreshAudit is UnitTestSetup {
             splits: new JBSplit[](0)
         });
 
-        vm.prank(owner);
-        testHook.adjustTiers(initialTier, new uint256[](0));
-
-        uint16[] memory tierIds = new uint16[](2);
-        tierIds[0] = 1;
-        tierIds[1] = 1;
-
-        JBAfterPayRecordedContext memory initialMint = JBAfterPayRecordedContext({
-            payer: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            amount: _nativeAmount(2 ether),
-            forwardedAmount: _nativeAmount(0),
-            weight: 10e18,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: bytes(""),
-            payerMetadata: _buildPayMetadata(address(testHook), false, tierIds)
-        });
-
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith(initialMint);
-
-        assertEq(
-            hookStore.numberOfPendingReservesFor(address(testHook), 1), 0, "no reserve obligation before default set"
+        // The new creation-time check prevents tiers with reserves but no beneficiary.
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
         );
-        assertEq(testHook.totalCashOutWeight(), 2 ether, "cash-out denominator initially matches sold NFTs");
-
-        JB721TierConfig[] memory activatingTier = new JB721TierConfig[](1);
-        activatingTier[0] = JB721TierConfig({
-            price: uint104(2 ether),
-            initialSupply: uint32(5),
-            votingUnits: 0,
-            reserveFrequency: uint16(1),
-            reserveBeneficiary: retroReserveBeneficiary,
-            encodedIPFSUri: bytes32(uint256(3)),
-            category: uint24(2),
-            discountPercent: 0,
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: true,
-                transfersPausable: false,
-                useVotingUnits: false,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-
         vm.prank(owner);
-        testHook.adjustTiers(activatingTier, new uint256[](0));
-
-        assertEq(
-            hookStore.defaultReserveBeneficiaryOf(address(testHook)),
-            retroReserveBeneficiary,
-            "new tier overwrites the hook-wide default reserve beneficiary"
-        );
-        assertEq(
-            hookStore.numberOfPendingReservesFor(address(testHook), 1),
-            1,
-            "historic mints on the older tier now retroactively create reserve debt"
-        );
-        assertEq(
-            testHook.totalCashOutWeight(),
-            3 ether,
-            "cash-out denominator dilutes existing holders before any new payment occurs"
-        );
-
-        testHook.mintPendingReservesFor(1, 1);
-
-        assertEq(
-            testHook.balanceOf(retroReserveBeneficiary), 1, "the new default beneficiary can mint retroactive reserves"
-        );
-        assertEq(hookStore.numberOfPendingReservesFor(address(testHook), 1), 0, "reserve debt is realized after mint");
+        testHook.adjustTiers(initialTier, new uint256[](0));
     }
 }

package/test/audit/{CodexNemesisFutureTierPoC.t.sol → FutureTierPoC.t.sol}

@@ -6,7 +6,7 @@ import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "../../src/interfaces/IJB721TokenUriResolver.sol";
 import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
 
-contract CodexNemesisFutureTierPoC is UnitTestSetup {
+contract FutureTierPoC is UnitTestSetup {
     function test_futureTierRemovalPersistsIntoNewTierAndBricksMint() external {
         hook = _initHookDefaultTiers(0);
 

package/test/audit/{20260425CodexNemesisFutureTierRemoval.t.sol → FutureTierRemoval.t.sol}

@@ -8,7 +8,7 @@ import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
 import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 
-contract Test_20260425CodexNemesisFutureTierRemoval is Test {
+contract Test_FutureTierRemoval is Test {
     JB721TiersHookStore internal store;
 
     function setUp() external {

package/test/audit/{CodexPayCreditsBypassTierSplits.t.sol → PayCreditsBypassTierSplits.t.sol}

@@ -13,7 +13,7 @@ import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 
-contract CodexPayCreditsBypassTierSplits is UnitTestSetup {
+contract PayCreditsBypassTierSplits is UnitTestSetup {
     address internal splitBeneficiary = makeAddr("splitBeneficiary");
 
     function setUp() public override {

package/test/audit/{CodexNemesisProjectDeployerAuth.t.sol → ProjectDeployerAuth.t.sol}

@@ -12,7 +12,6 @@ import {JBPayDataHookRulesetMetadata} from "../../src/structs/JBPayDataHookRules
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 import {JB721InitTiersConfig} from "../../src/structs/JB721InitTiersConfig.sol";
 import {JB721TiersHookFlags} from "../../src/structs/JB721TiersHookFlags.sol";
-import {IJB721TiersHook} from "../../src/interfaces/IJB721TiersHook.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
@@ -24,7 +23,7 @@ import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingCo
 import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
-contract MockProjectsForNemesis {
+contract MockProjects {
     uint256 internal _count;
     address internal _owner;
 
@@ -44,7 +43,7 @@ contract MockProjectsForNemesis {
     fallback() external {}
 }
 
-contract StrictControllerForNemesis {
+contract StrictController {
     address internal immutable EXPECTED_CALLER;
 
     error UnexpectedCaller(address caller);
@@ -62,7 +61,7 @@ contract StrictControllerForNemesis {
     }
 }
 
-contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
+contract Test_ProjectDeployerAuth is UnitTestSetup {
     JB721TiersHookProjectDeployer internal projectDeployer;
     address internal operator = address(0xBEEF);
     uint256 internal testProjectId = 5;
@@ -70,9 +69,9 @@ contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
     function setUp() public override {
         super.setUp();
 
-        MockProjectsForNemesis projects = new MockProjectsForNemesis();
+        MockProjects projects = new MockProjects();
         vm.etch(mockJBProjects, address(projects).code);
-        MockProjectsForNemesis(mockJBProjects).setup(testProjectId, owner);
+        MockProjects(mockJBProjects).setup(testProjectId, owner);
 
         vm.mockCall(mockJBDirectory, abi.encodeWithSelector(IJBDirectory.PROJECTS.selector), abi.encode(mockJBProjects));
 
@@ -85,12 +84,10 @@ contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
         (JBDeploy721TiersHookConfig memory hookConfig, JBLaunchRulesetsConfig memory launchConfig) =
             _launchConfig(testProjectId);
 
-        StrictControllerForNemesis controller = new StrictControllerForNemesis(owner);
+        StrictController controller = new StrictController(owner);
 
         vm.prank(owner);
-        vm.expectRevert(
-            abi.encodeWithSelector(StrictControllerForNemesis.UnexpectedCaller.selector, address(projectDeployer))
-        );
+        vm.expectRevert(abi.encodeWithSelector(StrictController.UnexpectedCaller.selector, address(projectDeployer)));
         projectDeployer.launchRulesetsFor(
             testProjectId, hookConfig, launchConfig, IJBController(address(controller)), bytes32(0)
         );
@@ -100,12 +97,10 @@ contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
         (JBDeploy721TiersHookConfig memory hookConfig, JBQueueRulesetsConfig memory queueConfig) =
             _queueConfig(testProjectId);
 
-        StrictControllerForNemesis controller = new StrictControllerForNemesis(owner);
+        StrictController controller = new StrictController(owner);
 
         vm.prank(owner);
-        vm.expectRevert(
-            abi.encodeWithSelector(StrictControllerForNemesis.UnexpectedCaller.selector, address(projectDeployer))
-        );
+        vm.expectRevert(abi.encodeWithSelector(StrictController.UnexpectedCaller.selector, address(projectDeployer)));
         projectDeployer.queueRulesetsOf(
             testProjectId, hookConfig, queueConfig, IJBController(address(controller)), bytes32(0)
         );
@@ -116,7 +111,7 @@ contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
             _launchConfig(testProjectId);
 
         address account = owner;
-        StrictControllerForNemesis controller = new StrictControllerForNemesis(owner);
+        StrictController controller = new StrictController(owner);
 
         // Grant LAUNCH_RULESETS and SET_TERMINALS, deny QUEUE_RULESETS.
         vm.mockCall(
@@ -162,9 +157,7 @@ contract Test_CodexNemesisProjectDeployerAuth is UnitTestSetup {
         // The permission check passes with LAUNCH_RULESETS. The call proceeds to the controller, which reverts
         // because it sees the deployer contract as the caller rather than the original operator.
         vm.prank(operator);
-        vm.expectRevert(
-            abi.encodeWithSelector(StrictControllerForNemesis.UnexpectedCaller.selector, address(projectDeployer))
-        );
+        vm.expectRevert(abi.encodeWithSelector(StrictController.UnexpectedCaller.selector, address(projectDeployer)));
         projectDeployer.launchRulesetsFor(
             testProjectId, hookConfig, launchConfig, IJBController(address(controller)), bytes32(0)
         );

package/test/audit/{CodexNemesisRepoFindings.t.sol → RepoFindings.t.sol}

@@ -3,11 +3,11 @@ pragma solidity 0.8.28;
 
 import "../utils/UnitTestSetup.sol";
 
-import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
+import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
-contract CodexNemesisRepoFindings is UnitTestSetup {
+contract RepoFindings is UnitTestSetup {
     address payable internal splitBeneficiary = payable(makeAddr("splitBeneficiary"));
 
     function _payMetadata(
@@ -157,6 +157,8 @@ contract CodexNemesisRepoFindings is UnitTestSetup {
         );
     }
 
+    /// @notice Creating a tier with reserveFrequency > 0 and no beneficiary (tier-specific or default)
+    /// is now rejected at creation time, preventing the retroactive dilution bug.
     function test_new_default_reserve_beneficiary_retroactively_dilutes_existing_tiers() public {
         ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
 
@@ -183,88 +185,11 @@ contract CodexNemesisRepoFindings is UnitTestSetup {
             splits: new JBSplit[](0)
         });
 
-        vm.prank(owner);
-        testHook.adjustTiers(initialTier, new uint256[](0));
-
-        mockAndExpect(
-            mockJBDirectory,
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        uint16[] memory tierIdsToMint = new uint16[](3);
-        tierIdsToMint[0] = 1;
-        tierIdsToMint[1] = 1;
-        tierIdsToMint[2] = 1;
-        bytes memory payerMetadata = _payMetadata(address(testHook), false, tierIdsToMint);
-
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith(
-            JBAfterPayRecordedContext({
-                payer: beneficiary,
-                projectId: projectId,
-                rulesetId: 0,
-                amount: _nativeTokenAmount(3 ether),
-                forwardedAmount: _nativeTokenAmount(0),
-                weight: 10e18,
-                newlyIssuedTokenCount: 0,
-                beneficiary: beneficiary,
-                hookMetadata: bytes(""),
-                payerMetadata: payerMetadata
-            })
-        );
-
-        assertEq(testHook.totalCashOutWeight(), 3 ether, "denominator initially reflects only sold NFTs");
-        assertEq(
-            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
-            0,
-            "without a reserve beneficiary the sold tier has no pending reserves"
+        // The new creation-time check prevents tiers with reserves but no beneficiary.
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
         );
-
-        JB721TierConfig[] memory defaultingTier = new JB721TierConfig[](1);
-        defaultingTier[0] = JB721TierConfig({
-            price: 2 ether,
-            initialSupply: 10,
-            votingUnits: 0,
-            reserveFrequency: 1,
-            reserveBeneficiary: owner,
-            encodedIPFSUri: bytes32(uint256(0x2222)),
-            category: 2,
-            discountPercent: 0,
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: true,
-                transfersPausable: false,
-                useVotingUnits: false,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-
         vm.prank(owner);
-        testHook.adjustTiers(defaultingTier, new uint256[](0));
-
-        assertEq(
-            testHook.STORE().reserveBeneficiaryOf(address(testHook), 1),
-            owner,
-            "the new default reserve beneficiary retroactively applies to the older sold tier"
-        );
-        assertEq(
-            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
-            2,
-            "the older tier now reports newly created pending reserves from past sales"
-        );
-        assertEq(
-            testHook.totalCashOutWeight(),
-            5 ether,
-            "cash-out denominator is diluted by retroactively created reserves on the existing tier"
-        );
-
-        testHook.mintPendingReservesFor(1, 2);
-
-        assertEq(testHook.balanceOf(owner), 2, "the owner can mint those retroactive reserve NFTs to themselves");
+        testHook.adjustTiers(initialTier, new uint256[](0));
     }
 }

package/test/audit/{20260425CodexNemesisReserveActivation.t.sol → ReserveActivation.t.sol}

@@ -9,14 +9,17 @@ import {JB721Tier} from "../../src/structs/JB721Tier.sol";
 import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
 import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 
-contract Test_20260425CodexNemesisReserveActivation is Test {
+contract Test_ReserveActivation is Test {
     JB721TiersHookStore internal store;
 
     function setUp() external {
         store = new JB721TiersHookStore();
     }
 
-    function test_retroactiveDefaultReserveBeneficiaryCreatesUnmintablePendingReserves() external {
+    /// @notice Creating a tier with reserveFrequency > 0 and no beneficiary (tier-specific or default)
+    /// is now rejected at creation time. This prevents the phantom-reserves scenario entirely.
+    function test_soldOutTier_noPhantomReserves_afterDefaultBeneficiaryChange() external {
+        // Attempt to add a tier with reserve frequency but no beneficiary — should revert.
         JB721TierConfig[] memory initialTiers = new JB721TierConfig[](1);
         initialTiers[0] = _tier({
             price: 1,
@@ -26,40 +29,31 @@ contract Test_20260425CodexNemesisReserveActivation is Test {
             useReserveBeneficiaryAsDefault: false,
             category: 1
         });
-        store.recordAddTiers(initialTiers);
-
-        uint16[] memory tierIds = new uint16[](10);
-        for (uint256 i; i < tierIds.length; i++) {
-            tierIds[i] = 1;
-        }
-        store.recordMint({amount: 10, tierIds: tierIds, isOwnerMint: false});
 
-        JB721Tier memory beforeDefault = store.tierOf({hook: address(this), id: 1, includeResolvedUri: false});
-        assertEq(beforeDefault.remainingSupply, 0);
-        assertEq(beforeDefault.reserveFrequency, 0);
-        assertEq(store.numberOfPendingReservesFor({hook: address(this), tierId: 1}), 0);
-        assertEq(store.totalCashOutWeight(address(this)), 10);
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
+        );
+        store.recordAddTiers(initialTiers);
+    }
 
-        JB721TierConfig[] memory laterTiers = new JB721TierConfig[](1);
-        laterTiers[0] = _tier({
+    /// @notice Creating a tier with reserveFrequency > 0 and no beneficiary (tier-specific or default)
+    /// is now rejected at creation time. This prevents the retroactive reserve activation scenario entirely.
+    function test_nonSoldOutTier_reservesStillWork_afterDefaultBeneficiaryChange() external {
+        // Attempt to add a tier with reserve frequency but no beneficiary — should revert.
+        JB721TierConfig[] memory initialTiers = new JB721TierConfig[](1);
+        initialTiers[0] = _tier({
             price: 1,
-            initialSupply: 10,
-            reserveFrequency: 2,
-            reserveBeneficiary: address(0xBEEF),
-            useReserveBeneficiaryAsDefault: true,
-            category: 2
+            initialSupply: 100,
+            reserveFrequency: 5,
+            reserveBeneficiary: address(0),
+            useReserveBeneficiaryAsDefault: false,
+            category: 1
         });
-        store.recordAddTiers(laterTiers);
-
-        JB721Tier memory afterDefault = store.tierOf({hook: address(this), id: 1, includeResolvedUri: false});
-        assertEq(afterDefault.remainingSupply, 0);
-        assertEq(afterDefault.reserveFrequency, 2);
-        assertEq(afterDefault.reserveBeneficiary, address(0xBEEF));
-        assertEq(store.numberOfPendingReservesFor({hook: address(this), tierId: 1}), 5);
-        assertEq(store.totalCashOutWeight(address(this)), 15);
 
-        vm.expectRevert();
-        store.recordMintReservesFor({tierId: 1, count: 1});
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
+        );
+        store.recordAddTiers(initialTiers);
     }
 
     function _tier(

package/test/audit/RetroactiveReserveBeneficiaryDilution.t.sol

@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "../utils/UnitTestSetup.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
+import {JBAfterPayRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterPayRecordedContext.sol";
+import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
+import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
+
+contract RetroactiveReserveBeneficiaryDilution is UnitTestSetup {
+    /// @notice Creating a tier with reserveFrequency > 0 but no beneficiary (tier-specific or default) now reverts,
+    /// preventing the phantom reserve scenario where a later default beneficiary retroactively inflates
+    /// totalCashOutWeight and dilutes existing holders.
+    function test_adjustTier_reverts_when_reserve_has_no_beneficiary() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+
+        JB721TierConfig[] memory tier1 = new JB721TierConfig[](1);
+        tier1[0] = JB721TierConfig({
+            price: 1 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 2,
+            reserveBeneficiary: address(0),
+            encodedIPFSUri: bytes32(uint256(0x1234)),
+            category: 1,
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: false,
+                transfersPausable: false,
+                useVotingUnits: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        vm.prank(owner);
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
+        );
+        testHook.adjustTiers(tier1, new uint256[](0));
+    }
+
+    /// @notice A tier with reserveFrequency > 0 succeeds when an explicit beneficiary is provided.
+    function test_adjustTier_succeeds_with_explicit_reserve_beneficiary() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+
+        JB721TierConfig[] memory tier1 = new JB721TierConfig[](1);
+        tier1[0] = JB721TierConfig({
+            price: 1 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 2,
+            reserveBeneficiary: owner,
+            encodedIPFSUri: bytes32(uint256(0x1234)),
+            category: 1,
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: false,
+                transfersPausable: false,
+                useVotingUnits: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        vm.prank(owner);
+        testHook.adjustTiers(tier1, new uint256[](0));
+
+        assertEq(
+            testHook.STORE().reserveBeneficiaryOf(address(testHook), 1),
+            owner,
+            "tier-specific beneficiary should be set"
+        );
+    }
+
+    /// @notice A tier with reserveFrequency > 0 and no explicit beneficiary succeeds when a default beneficiary
+    /// was previously set by an earlier tier.
+    function test_adjustTier_succeeds_with_default_reserve_beneficiary() public {
+        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
+
+        // Add two tiers: first sets the default beneficiary, second relies on it.
+        JB721TierConfig[] memory tiers = new JB721TierConfig[](2);
+
+        // Tier 1: sets default beneficiary via useReserveBeneficiaryAsDefault.
+        tiers[0] = JB721TierConfig({
+            price: 1 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 2,
+            reserveBeneficiary: owner,
+            encodedIPFSUri: bytes32(uint256(0x1234)),
+            category: 1,
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: true,
+                transfersPausable: false,
+                useVotingUnits: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        // Tier 2: relies on the default beneficiary (no explicit one).
+        tiers[1] = JB721TierConfig({
+            price: 2 ether,
+            initialSupply: 100,
+            votingUnits: 0,
+            reserveFrequency: 3,
+            reserveBeneficiary: address(0),
+            encodedIPFSUri: bytes32(uint256(0x5678)),
+            category: 2,
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: false,
+                transfersPausable: false,
+                useVotingUnits: false,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        vm.prank(owner);
+        testHook.adjustTiers(tiers, new uint256[](0));
+
+        // Tier 2 should inherit the default beneficiary set by tier 1.
+        assertEq(
+            testHook.STORE().reserveBeneficiaryOf(address(testHook), 2),
+            owner,
+            "tier 2 should inherit default beneficiary"
+        );
+    }
+}

package/test/audit/{CodexSplitCreditsMismatch.t.sol → SplitCreditsMismatch.t.sol}

@@ -15,7 +15,7 @@ import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
 /// @notice Regression test: split metadata is proportionally scaled when credits fund a split-bearing tier mint.
 /// @dev Previously (pre-fix), the per-tier split amounts were left at the uncapped value, trapping forwarded ETH.
 /// After the F-2 fix, split amounts are scaled down to match the actual forwarded amount.
-contract CodexSplitCreditsMismatch is UnitTestSetup {
+contract SplitCreditsMismatch is UnitTestSetup {
     address internal splitBeneficiary = makeAddr("splitBeneficiary");
 
     function setUp() public override {

package/test/unit/mintFor_mintReservesFor_Unit.t.sol

@@ -360,55 +360,39 @@ contract Test_mintFor_mintReservesFor_Unit is UnitTestSetup {
         }
     }
 
+    /// @notice Tiers with reserveFrequency > 0 and no beneficiary are now rejected at creation time.
+    /// This test verifies that the creation-time check prevents such tiers from existing.
     function test_numberOfPendingReservesFor_noReservesIfNoBeneficiarySet() public {
-        uint256 initialSupply = 200; // The number of NFTs available for each tier.
-        uint256 totalMinted = 120; // The number of NFTs already minted for each tier (out of `initialSupply`).
-        uint256 reservedMinted = 10; // The number of reserve NFTs already minted (out of `totalMinted`).
-        uint256 reserveFrequency = 9; // The frequency at which NFTs are reserved.
-        // (For every 9 NFTs minted, 1 is reserved).
-
-        reserveBeneficiary = address(0);
-        ForTest_JB721TiersHook hook = _initializeForTestHook(10);
-
-        // Initialize `numberOfTiers` tiers, and set the number of reserve NFTs already minted for each tier.
-        // Although the `reserveFrequency` is set, it should be ignored since there is no reserve beneficiary.
-        for (uint256 i; i < 10; i++) {
-            hook.test_store()
-                .ForTest_setTier(
-                    address(hook),
-                    i + 1,
-                    JBStored721Tier({
-                        price: uint104((i + 1) * 10),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        remainingSupply: uint32(initialSupply - totalMinted),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        initialSupply: uint32(initialSupply),
-                        // forge-lint: disable-next-line(unsafe-typecast)
-                        reserveFrequency: uint16(reserveFrequency),
-                        category: uint24(100),
-                        discountPercent: uint8(0),
-                        packedBools: hook.test_store().ForTest_packBools(false, false, true, false, false, false),
-                        splitPercent: 0
-                    })
-                );
-            hook.test_store().ForTest_setReservesMintedFor(address(hook), i + 1, reservedMinted);
-        }
-
-        // Fetch the stored tiers.
-        JB721Tier[] memory storedTiers = hook.test_store().tiersOf(address(hook), new uint256[](0), false, 0, 10);
-
-        // Check: did the reserve frequency default to 0 for all tiers?
-        for (uint256 i; i < 10; i++) {
-            assertEq(storedTiers[i].reserveFrequency, 0, "Reserve frequency should be zero (no beneficiary set).");
-        }
-        // Check: are we sure there are no pending reserves for all tiers?
-        for (uint256 i; i < 10; i++) {
-            assertEq(
-                hook.test_store().numberOfPendingReservesFor(address(hook), i + 1),
-                0,
-                "There should not be any pending reserves (no beneficiary set)."
-            );
-        }
+        // Build tier configs with reserveFrequency > 0 but reserveBeneficiary == address(0).
+        JB721TierConfig[] memory tierConfigs = new JB721TierConfig[](1);
+        tierConfigs[0] = JB721TierConfig({
+            price: uint104(10),
+            initialSupply: uint32(200),
+            votingUnits: 0,
+            reserveFrequency: uint16(9),
+            reserveBeneficiary: address(0),
+            encodedIPFSUri: bytes32(uint256(1)),
+            category: uint24(100),
+            discountPercent: 0,
+            flags: JB721TierConfigFlags({
+                allowOwnerMint: false,
+                useReserveBeneficiaryAsDefault: false,
+                transfersPausable: false,
+                useVotingUnits: true,
+                cantBeRemoved: false,
+                cantIncreaseDiscountPercent: false,
+                cantBuyWithCredits: false
+            }),
+            splitPercent: 0,
+            splits: new JBSplit[](0)
+        });
+
+        // The creation-time check should reject a tier with reserves but no beneficiary.
+        ForTest_JB721TiersHookStore hookStore = new ForTest_JB721TiersHookStore();
+        vm.expectRevert(
+            abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_MissingReserveBeneficiary.selector, 1)
+        );
+        hookStore.recordAddTiers(tierConfigs);
     }
 
     function test_mintFor_mintArrayOfTiers() public {

package/test/audit/CodexRetroactiveReserveBeneficiaryDilution.t.sol

@@ -1,161 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "../utils/UnitTestSetup.sol";
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {JBAfterPayRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterPayRecordedContext.sol";
-import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
-
-contract CodexRetroactiveReserveBeneficiaryDilution is UnitTestSetup {
-    function _buildPayMetadata(address hookAddress, uint16[] memory tierIdsToMint)
-        internal
-        view
-        returns (bytes memory)
-    {
-        bytes[] memory data = new bytes[](1);
-        data[0] = abi.encode(true, tierIdsToMint);
-        bytes4[] memory ids = new bytes4[](1);
-        ids[0] = metadataHelper.getId("pay", hookAddress);
-        return metadataHelper.createMetadata(ids, data);
-    }
-
-    function _afterPayContext(
-        address hookAddress,
-        uint256 amountValue,
-        uint16[] memory tierIdsToMint
-    )
-        internal
-        view
-        returns (JBAfterPayRecordedContext memory)
-    {
-        return JBAfterPayRecordedContext({
-            payer: beneficiary,
-            projectId: projectId,
-            rulesetId: 0,
-            amount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: amountValue,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            forwardedAmount: JBTokenAmount({
-                token: JBConstants.NATIVE_TOKEN,
-                value: 0,
-                decimals: 18,
-                currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            }),
-            weight: 10e18,
-            newlyIssuedTokenCount: 0,
-            beneficiary: beneficiary,
-            hookMetadata: "",
-            payerMetadata: _buildPayMetadata(hookAddress, tierIdsToMint)
-        });
-    }
-
-    function test_adjustTier_can_retroactively_create_reserves_for_existing_supply() public {
-        ForTest_JB721TiersHook testHook = _initializeForTestHook(0);
-
-        JB721TierConfig[] memory tier1 = new JB721TierConfig[](1);
-        tier1[0] = JB721TierConfig({
-            price: 1 ether,
-            initialSupply: 100,
-            votingUnits: 0,
-            reserveFrequency: 2,
-            reserveBeneficiary: address(0),
-            encodedIPFSUri: bytes32(uint256(0x1234)),
-            category: 1,
-            discountPercent: 0,
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: false,
-                transfersPausable: false,
-                useVotingUnits: false,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-
-        vm.prank(owner);
-        testHook.adjustTiers(tier1, new uint256[](0));
-
-        assertEq(
-            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
-            0,
-            "no beneficiary means no reserves are pending"
-        );
-
-        vm.mockCall(
-            mockJBDirectory,
-            abi.encodeWithSelector(IJBDirectory.isTerminalOf.selector, projectId, mockTerminalAddress),
-            abi.encode(true)
-        );
-
-        uint16[] memory mintIds = new uint16[](3);
-        mintIds[0] = 1;
-        mintIds[1] = 1;
-        mintIds[2] = 1;
-
-        JBAfterPayRecordedContext memory payContext = _afterPayContext(address(testHook), 3 ether, mintIds);
-        vm.prank(mockTerminalAddress);
-        testHook.afterPayRecordedWith(payContext);
-
-        assertEq(testHook.balanceOf(beneficiary), 3, "beneficiary should own the three paid NFTs");
-        assertEq(testHook.totalCashOutWeight(), 3 ether, "denominator initially reflects only sold NFTs");
-
-        JB721TierConfig[] memory tier2 = new JB721TierConfig[](1);
-        tier2[0] = JB721TierConfig({
-            price: 2 ether,
-            initialSupply: 100,
-            votingUnits: 0,
-            reserveFrequency: 1,
-            reserveBeneficiary: owner,
-            encodedIPFSUri: bytes32(uint256(0x5678)),
-            category: 2,
-            discountPercent: 0,
-            flags: JB721TierConfigFlags({
-                allowOwnerMint: false,
-                useReserveBeneficiaryAsDefault: true,
-                transfersPausable: false,
-                useVotingUnits: false,
-                cantBeRemoved: false,
-                cantIncreaseDiscountPercent: false,
-                cantBuyWithCredits: false
-            }),
-            splitPercent: 0,
-            splits: new JBSplit[](0)
-        });
-
-        vm.prank(owner);
-        testHook.adjustTiers(tier2, new uint256[](0));
-
-        assertEq(
-            testHook.STORE().reserveBeneficiaryOf(address(testHook), 1),
-            owner,
-            "new default beneficiary retroactively applies to the old tier"
-        );
-        assertEq(
-            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
-            2,
-            "historical sales now generate retroactive pending reserves"
-        );
-        assertEq(
-            testHook.totalCashOutWeight(),
-            5 ether,
-            "existing holders are diluted before any new payment enters the system"
-        );
-
-        vm.prank(address(0xBEEF));
-        testHook.mintPendingReservesFor(1, 2);
-
-        assertEq(testHook.balanceOf(owner), 2, "retroactive reserves mint directly to the new default beneficiary");
-        assertEq(
-            testHook.STORE().numberOfPendingReservesFor(address(testHook), 1),
-            0,
-            "all retroactive reserve entitlement can be extracted"
-        );
-    }
-}