@bananapus/721-hook-v6 0.0.39 → 0.0.40

package/package.json

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

package/src/JB721TiersHookStore.sol

@@ -1291,6 +1291,12 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             // Set the tier being iterated upon (0-indexed).
             uint256 tierId = tierIds[i];
 
+            // Reject tier IDs that don't exist yet — removing a future tier would cause it
+            // to be born already removed when later added.
+            if (tierId == 0 || tierId > maxTierIdOf[msg.sender]) {
+                revert JB721TiersHookStore_UnrecognizedTier(tierId);
+            }
+
             // Get a reference to the stored tier.
             JBStored721Tier storage storedTier = _storedTierOf[msg.sender][tierId];
 

package/test/audit/20260425CodexNemesisFutureTierRemoval.t.sol

@@ -21,21 +21,12 @@ contract Test_20260425CodexNemesisFutureTierRemoval is Test {
         uint256[] memory firstIds = store.recordAddTiers(firstTier);
         assertEq(firstIds[0], 1);
 
+        // Attempting to remove a future (nonexistent) tier ID should now revert
+        // thanks to the L-18 fix, preventing the "born removed" bug.
         uint256[] memory futureIds = new uint256[](1);
         futureIds[0] = 2;
+        vm.expectRevert(abi.encodeWithSignature("JB721TiersHookStore_UnrecognizedTier(uint256)", 2));
         store.recordRemoveTierIds(futureIds);
-        assertTrue(store.isTierRemoved({hook: address(this), tierId: 2}));
-
-        JB721TierConfig[] memory secondTier = new JB721TierConfig[](1);
-        secondTier[0] = _tier(2);
-        uint256[] memory secondIds = store.recordAddTiers(secondTier);
-        assertEq(secondIds[0], 2);
-        assertTrue(store.isTierRemoved({hook: address(this), tierId: 2}));
-
-        uint16[] memory tierIds = new uint16[](1);
-        tierIds[0] = 2;
-        vm.expectRevert(abi.encodeWithSignature("JB721TiersHookStore_TierRemoved(uint256)", 2));
-        store.recordMint({amount: 1, tierIds: tierIds, isOwnerMint: false});
     }
 
     function _tier(uint24 category) internal pure returns (JB721TierConfig memory tier) {

package/test/audit/CodexNemesisFutureTierPoC.t.sol

@@ -13,23 +13,11 @@ contract CodexNemesisFutureTierPoC is UnitTestSetup {
         uint256[] memory futureTierIds = new uint256[](1);
         futureTierIds[0] = 1;
 
+        // L-18 FIX: Removing a future (nonexistent) tier ID now reverts,
+        // preventing the "born removed" bug entirely.
         vm.prank(owner);
+        vm.expectRevert(abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_UnrecognizedTier.selector, 1));
         hook.adjustTiers(new JB721TierConfig[](0), futureTierIds);
-
-        (JB721TierConfig[] memory tiersToAdd,) = _createTiers(defaultTierConfig, 1);
-
-        vm.prank(owner);
-        hook.adjustTiers(tiersToAdd, new uint256[](0));
-
-        assertTrue(hook.STORE().isTierRemoved(address(hook), 1), "future removal flag should persist");
-
-        uint16[] memory tierIds = new uint16[](1);
-        tierIds[0] = 1;
-        JB721TiersHookStore store = JB721TiersHookStore(address(hook.STORE()));
-
-        vm.expectRevert(abi.encodeWithSelector(JB721TiersHookStore.JB721TiersHookStore_TierRemoved.selector, 1));
-        vm.prank(address(hook));
-        store.recordMint(type(uint256).max, tierIds, false);
     }
 
     function test_futureTierUriCanBePoisonedBeforeTierExists() external {

package/test/audit/Pass12L18.t.sol

@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import {Test} from "forge-std/Test.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+
+import {JB721TiersHookStore} from "../../src/JB721TiersHookStore.sol";
+import {JB721TierConfig} from "../../src/structs/JB721TierConfig.sol";
+import {JB721TierConfigFlags} from "../../src/structs/JB721TierConfigFlags.sol";
+
+/// @notice L-18: Prevent future tier pre-removal.
+/// Removing a tier ID that does not yet exist should revert with `UnrecognizedTier`.
+contract Pass12L18 is Test {
+    JB721TiersHookStore internal store;
+
+    function setUp() external {
+        store = new JB721TiersHookStore();
+    }
+
+    /// @notice Removing a future tier ID (beyond maxTierIdOf) must revert.
+    function test_L18_fix_reverts_future_removal() external {
+        // Add 5 tiers so maxTierIdOf == 5.
+        JB721TierConfig[] memory tiers = new JB721TierConfig[](5);
+        for (uint256 i; i < 5; i++) {
+            tiers[i] = _tier(uint24(i + 1));
+        }
+        store.recordAddTiers(tiers);
+        assertEq(store.maxTierIdOf(address(this)), 5);
+
+        // Attempt to remove tier 10 (future) — should revert.
+        uint256[] memory futureTierIds = new uint256[](1);
+        futureTierIds[0] = 10;
+        vm.expectRevert(abi.encodeWithSignature("JB721TiersHookStore_UnrecognizedTier(uint256)", 10));
+        store.recordRemoveTierIds(futureTierIds);
+
+        // Attempt to remove tier 0 (invalid) — should also revert.
+        uint256[] memory zeroTierIds = new uint256[](1);
+        zeroTierIds[0] = 0;
+        vm.expectRevert(abi.encodeWithSignature("JB721TiersHookStore_UnrecognizedTier(uint256)", 0));
+        store.recordRemoveTierIds(zeroTierIds);
+    }
+
+    /// @notice Removing an existing tier still works as before.
+    function test_L18_existing_tier_removal_works() external {
+        // Add 5 tiers.
+        JB721TierConfig[] memory tiers = new JB721TierConfig[](5);
+        for (uint256 i; i < 5; i++) {
+            tiers[i] = _tier(uint24(i + 1));
+        }
+        store.recordAddTiers(tiers);
+
+        // Remove tier 3 — should succeed.
+        uint256[] memory removeTierIds = new uint256[](1);
+        removeTierIds[0] = 3;
+        store.recordRemoveTierIds(removeTierIds);
+        assertTrue(store.isTierRemoved({hook: address(this), tierId: 3}));
+
+        // Other tiers should not be affected.
+        assertFalse(store.isTierRemoved({hook: address(this), tierId: 1}));
+        assertFalse(store.isTierRemoved({hook: address(this), tierId: 2}));
+        assertFalse(store.isTierRemoved({hook: address(this), tierId: 4}));
+        assertFalse(store.isTierRemoved({hook: address(this), tierId: 5}));
+    }
+
+    function _tier(uint24 category) internal pure returns (JB721TierConfig memory tier) {
+        tier.price = 1;
+        tier.initialSupply = 10;
+        tier.category = category;
+        tier.flags = JB721TierConfigFlags({
+            allowOwnerMint: false,
+            useReserveBeneficiaryAsDefault: false,
+            transfersPausable: false,
+            useVotingUnits: false,
+            cantBeRemoved: false,
+            cantIncreaseDiscountPercent: false,
+            cantBuyWithCredits: false
+        });
+        tier.splits = new JBSplit[](0);
+    }
+}

package/test/fork/ERC20CashOutFork.t.sol

@@ -160,7 +160,7 @@ contract ERC20CashOutFork is Test {
     receive() external payable {}
 
     function setUp() public {
-        vm.createSelectFork("ethereum");
+        vm.createSelectFork("ethereum", 24_971_900);
 
         _deployJBCore();
         _deploy721Hook();