@bananapus/721-hook-v6 0.0.41 → 0.0.43

package/foundry.lock

@@ -1,11 +1,5 @@
 {
   "lib/forge-std": {
     "rev": "77876f8a5b44b770a935621bb331660c90ac928e"
-  },
-  "lib/sphinx": {
-    "branch": {
-      "name": "v0.23.0",
-      "rev": "5fb24a825f46bd6ae0b5359fe0da1d2346126b09"
-    }
   }
-}
+}

package/foundry.toml

@@ -14,7 +14,7 @@ depth = 100
 fail_on_revert = false
 
 [lint]
-exclude_lints = ["pascal-case-struct", "mixed-case-variable"]
+exclude_lints = ["mixed-case-variable", "pascal-case-struct"]
 [fmt]
 number_underscore = "thousands"
 multiline_func_header = "all"

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Bananapus/nana-721-hook-v6"
   },
+  "files": [
+    "CHANGELOG.md",
+    "foundry.lock",
+    "foundry.toml",
+    "references/",
+    "remappings.txt",
+    "script/",
+    "sphinx.lock",
+    "src/",
+    "test/utils/"
+  ],
   "engines": {
     "node": ">=20.0.0"
   },
@@ -17,15 +28,15 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-721-hook-v6'"
   },
   "dependencies": {
-    "@bananapus/address-registry-v6": "^0.0.20",
-    "@bananapus/core-v6": "^0.0.36",
-    "@bananapus/ownable-v6": "^0.0.20",
-    "@bananapus/permission-ids-v6": "^0.0.19",
-    "@openzeppelin/contracts": "^5.6.1",
-    "@prb/math": "^4.1.0",
-    "solady": "^0.1.8"
+    "@bananapus/address-registry-v6": "0.0.25",
+    "@bananapus/core-v6": "^0.0.39",
+    "@bananapus/ownable-v6": "^0.0.24",
+    "@bananapus/permission-ids-v6": "0.0.22",
+    "@openzeppelin/contracts": "5.6.1",
+    "@prb/math": "4.1.1",
+    "solady": "0.1.26"
   },
   "devDependencies": {
-    "@sphinx-labs/plugins": "^0.33.2"
+    "@sphinx-labs/plugins": "0.33.3"
   }
 }

package/script/Deploy.s.sol

@@ -87,12 +87,12 @@ contract DeployScript is Script, Sphinx {
             (address _deployer, bool _deployerIsDeployed) = _isDeployed({
                 salt: CHECKPOINTS_DEPLOYER_SALT,
                 creationCode: type(JB721CheckpointsDeployer).creationCode,
-                arguments: ""
+                arguments: abi.encode(store)
             });
 
             // Deploy it if it has not been deployed yet.
             checkpointsDeployer = !_deployerIsDeployed
-                ? new JB721CheckpointsDeployer{salt: CHECKPOINTS_DEPLOYER_SALT}()
+                ? new JB721CheckpointsDeployer{salt: CHECKPOINTS_DEPLOYER_SALT}(store)
                 : JB721CheckpointsDeployer(_deployer);
         }
 

package/src/JB721Checkpoints.sol

@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
 
-import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import {Votes} from "@openzeppelin/contracts/governance/utils/Votes.sol";
+import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
+import {Checkpoints} from "@openzeppelin/contracts/utils/structs/Checkpoints.sol";
+
 import {IJB721Checkpoints} from "./interfaces/IJB721Checkpoints.sol";
+import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 
 /// @title JB721Checkpoints
@@ -14,6 +17,8 @@ import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 /// (`_cachedThis`) is uninitialized on clones, so `domainSeparatorV4()` always rebuilds using the clone's
 /// `address(this)` — correct behavior, tiny gas overhead.
 contract JB721Checkpoints is Votes, IJB721Checkpoints {
+    using Checkpoints for Checkpoints.Trace160;
+
     //*********************************************************************//
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
@@ -22,45 +27,51 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     error JB721Checkpoints_Unauthorized();
 
     //*********************************************************************//
-    // --------------------- private stored properties ------------------ //
+    // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
 
-    /// @notice Whether this contract has been initialized.
-    bool private _initialized;
+    /// @notice The store that holds tier and voting data for the hook's NFTs.
+    IJB721TiersHookStore public immutable override STORE;
 
     //*********************************************************************//
-    // ---------------------- public stored properties ------------------- //
+    // --------------------- public stored properties -------------------- //
     //*********************************************************************//
 
     /// @notice The hook that this module tracks voting power for.
     address public override HOOK;
 
-    /// @notice The store that holds tier and voting data for the hook's NFTs.
-    IJB721TiersHookStore public override STORE;
+    //*********************************************************************//
+    // -------------------- internal stored properties ------------------- //
+    //*********************************************************************//
+
+    /// @notice Checkpointed token owners for historical reward eligibility after first transfer.
+    /// @custom:param tokenId The token ID to get historical owner checkpoints for.
+    mapping(uint256 tokenId => Checkpoints.Trace160) internal _ownerCheckpointsOf;
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    /// @dev Parameterless. The implementation contract is initialized in the constructor to prevent direct use.
-    /// Clones are initialized via `initialize()`.
-    constructor() EIP712("JB721Checkpoints", "1") {
-        _initialized = true;
+    /// @dev The implementation contract is initialized in the constructor to prevent direct use. Clones are initialized
+    /// via `initialize()`.
+    /// @param store The store that holds tier data for each hook's NFTs.
+    constructor(IJB721TiersHookStore store) EIP712("JB721Checkpoints", "1") {
+        STORE = store;
+        HOOK = address(1);
     }
 
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
-    /// @notice Initializes a cloned module with its hook and store references.
+    /// @notice Initializes a cloned module with its hook reference.
     /// @dev Can only be called once. Called by the deployer after cloning.
     /// @param hook The hook this module serves.
-    /// @param store The store that holds tier data for the hook's NFTs.
-    function initialize(address hook, IJB721TiersHookStore store) external override {
-        if (_initialized) revert JB721Checkpoints_AlreadyInitialized();
-        _initialized = true;
+    function initialize(address hook) external override {
+        if (HOOK != address(0)) revert JB721Checkpoints_AlreadyInitialized();
+        // `hook` cannot be zero when called through the deployer because `msg.sender` must equal `hook`.
+        // slither-disable-next-line missing-zero-check
         HOOK = hook;
-        STORE = store;
     }
 
     /// @notice Called by the hook after every NFT transfer to update checkpointed voting power.
@@ -71,6 +82,12 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     function onTransfer(address from, address to, uint256 tokenId) external override {
         if (msg.sender != HOOK) revert JB721Checkpoints_Unauthorized();
 
+        if (from != address(0)) {
+            // forge-lint: disable-next-line(unsafe-typecast)
+            // slither-disable-next-line unused-return
+            _ownerCheckpointsOf[tokenId].push({key: uint96(block.number), value: uint160(to)});
+        }
+
         // Look up this token's tier to get its voting units.
         uint256 votingUnits = STORE.tierOfTokenId({hook: HOOK, tokenId: tokenId, includeResolvedUri: false}).votingUnits;
 
@@ -79,7 +96,32 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     }
 
     //*********************************************************************//
-    // ------------------------ internal functions ----------------------- //
+    // ----------------------- external views ---------------------------- //
+    //*********************************************************************//
+
+    /// @notice The owner of an NFT at a past block.
+    /// @dev Mints do not write per-token checkpoint storage. Until a token's first non-mint transfer, ownership is
+    /// inferred from the hook's `firstOwnerOf`.
+    /// @param tokenId The token ID of the NFT to get the historical owner of.
+    /// @param blockNumber The block number to look up.
+    /// @return The owner of the token at `blockNumber`, or zero if the token has no known owner.
+    function ownerOfAt(uint256 tokenId, uint256 blockNumber) external view override returns (address) {
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint96 blockNumber96 = uint96(blockNumber);
+
+        Checkpoints.Trace160 storage checkpoints = _ownerCheckpointsOf[tokenId];
+        uint256 checkpointCount = checkpoints.length();
+
+        // Before the first transfer/burn checkpoint, the mint owner is implicit in the hook's first-owner tracking.
+        if (checkpointCount == 0 || checkpoints.at(0)._key > blockNumber96) {
+            return IJB721TiersHook(HOOK).firstOwnerOf(tokenId);
+        }
+
+        return address(uint160(checkpoints.upperLookupRecent(blockNumber96)));
+    }
+
+    //*********************************************************************//
+    // ----------------------- internal views ---------------------------- //
     //*********************************************************************//
 
     /// @notice Returns the total voting units held by an account (across all tiers).

package/src/JB721CheckpointsDeployer.sol

@@ -2,6 +2,7 @@
 pragma solidity 0.8.28;
 
 import {LibClone} from "solady/src/utils/LibClone.sol";
+
 import {JB721Checkpoints} from "./JB721Checkpoints.sol";
 import {IJB721Checkpoints} from "./interfaces/IJB721Checkpoints.sol";
 import {IJB721CheckpointsDeployer} from "./interfaces/IJB721CheckpointsDeployer.sol";
@@ -19,12 +20,17 @@ contract JB721CheckpointsDeployer is IJB721CheckpointsDeployer {
     /// @notice The checkpoint module implementation that clones delegate to.
     address public immutable override IMPLEMENTATION;
 
+    /// @notice The store that holds tier and voting data for each hook's NFTs.
+    IJB721TiersHookStore public immutable override STORE;
+
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    constructor() {
-        IMPLEMENTATION = address(new JB721Checkpoints());
+    /// @param store The store that holds tier data for each hook's NFTs.
+    constructor(IJB721TiersHookStore store) {
+        STORE = store;
+        IMPLEMENTATION = address(new JB721Checkpoints(store));
     }
 
     //*********************************************************************//
@@ -34,14 +40,13 @@ contract JB721CheckpointsDeployer is IJB721CheckpointsDeployer {
     /// @notice Deploys a new deterministic checkpoint clone for the given hook.
     /// @dev Uses CREATE2 with the hook address as salt so the clone address is the same across chains.
     /// @param hook The hook address the module will serve.
-    /// @param store The store that holds tier data for the hook's NFTs.
     /// @return module The newly deployed and initialized checkpoint module.
-    function deploy(address hook, IJB721TiersHookStore store) external override returns (IJB721Checkpoints module) {
+    function deploy(address hook) external override returns (IJB721Checkpoints module) {
         if (msg.sender != hook) revert JB721CheckpointsDeployer_Unauthorized();
 
         module = IJB721Checkpoints(
             LibClone.cloneDeterministic({implementation: IMPLEMENTATION, salt: bytes32(uint256(uint160(hook)))})
         );
-        module.initialize({hook: hook, store: store});
+        module.initialize(hook);
     }
 }

package/src/JB721TiersHook.sol

@@ -656,6 +656,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         if (tokenIds.length != 0) {
             // totalAmountPaid is the full amount available before recordMint deducted tier prices.
             uint256 totalAmountPaid = (payer == beneficiary) ? value + payCredits : value;
+            // slither-disable-next-line reentrancy-events
             _mintTokens({
                 tokenIds: tokenIds, tierIds: tierIdsToMint, beneficiary: beneficiary, totalAmountPaid: totalAmountPaid
             });
@@ -791,10 +792,12 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
 
         // Deploy the checkpoint module lazily on the first transfer.
         if (address(CHECKPOINTS) == address(0)) {
-            CHECKPOINTS = CHECKPOINTS_DEPLOYER.deploy({hook: address(this), store: STORE});
+            // slither-disable-next-line calls-loop,reentrancy-events
+            CHECKPOINTS = CHECKPOINTS_DEPLOYER.deploy(address(this));
         }
 
         // Notify the checkpoint module to update checkpointed voting power.
+        // slither-disable-next-line calls-loop,reentrancy-events
         CHECKPOINTS.onTransfer({from: from, to: to, tokenId: tokenId});
     }
 }

package/src/JB721TiersHookProjectDeployer.sol

@@ -11,6 +11,7 @@ import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadat
 import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 
 import {IJB721TiersHook} from "./interfaces/IJB721TiersHook.sol";
@@ -25,7 +26,12 @@ 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
 /// `JBPermissionIds.QUEUE_RULESETS` or `JBPermissionIds.LAUNCH_RULESETS`.
-contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721TiersHookProjectDeployer {
+contract JB721TiersHookProjectDeployer is
+    ERC2771Context,
+    JBPermissioned,
+    IERC721Receiver,
+    IJB721TiersHookProjectDeployer
+{
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
@@ -82,8 +88,9 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
         override
         returns (uint256 projectId, IJB721TiersHook hook)
     {
-        // Get the project's ID, optimistically knowing it will be one greater than the current number of projects.
-        projectId = DIRECTORY.PROJECTS().count() + 1;
+        // Reserve the project ID up front so permissionless project creations cannot invalidate hook deployment.
+        IJBProjects PROJECTS = DIRECTORY.PROJECTS();
+        projectId = PROJECTS.createFor(address(this));
 
         // Deploy the hook.
         hook = HOOK_DEPLOYER.deployHookFor({
@@ -92,13 +99,16 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
             salt: salt == bytes32(0) ? bytes32(0) : keccak256(abi.encode(_msgSender(), salt))
         });
 
-        // Launch the project.
+        // Launch the rulesets for the reserved project.
         _launchProjectFor({
-            owner: owner, launchProjectConfig: launchProjectConfig, dataHook: hook, controller: controller
+            projectId: projectId, launchProjectConfig: launchProjectConfig, dataHook: hook, controller: controller
         });
 
         // Transfer the hook's ownership to the project.
         JBOwnable(address(hook)).transferOwnershipToProject(projectId);
+
+        // Transfer the project NFT to its intended owner.
+        PROJECTS.safeTransferFrom({from: address(this), to: owner, tokenId: projectId});
     }
 
     /// @notice Launches rulesets for a project with an attached 721 tiers hook.
@@ -108,6 +118,7 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
     /// @param deployTiersHookConfig Configuration which dictates the behavior of the 721 tiers hook which is being
     /// deployed.
     /// @param launchRulesetsConfig Configuration which dictates the project's new rulesets.
+    /// @param projectUri Metadata URI to associate with the project. Pass an empty string to leave it unchanged.
     /// @param controller The controller that the project's rulesets will be queued with.
     /// @param salt A salt to use for the deterministic deployment.
     /// @return rulesetId The ID of the successfully created ruleset.
@@ -116,6 +127,7 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
         uint256 projectId,
         JBDeploy721TiersHookConfig calldata deployTiersHookConfig,
         JBLaunchRulesetsConfig calldata launchRulesetsConfig,
+        string calldata projectUri,
         IJBController controller,
         bytes32 salt
     )
@@ -125,16 +137,23 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
     {
         // Get the project's projects contract.
         IJBProjects PROJECTS = DIRECTORY.PROJECTS();
+        address projectOwner = PROJECTS.ownerOf(projectId);
 
         // Enforce permissions.
         _requirePermissionFrom({
-            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.LAUNCH_RULESETS
+            account: projectOwner, projectId: projectId, permissionId: JBPermissionIds.LAUNCH_RULESETS
         });
 
         _requirePermissionFrom({
-            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.SET_TERMINALS
+            account: projectOwner, projectId: projectId, permissionId: JBPermissionIds.SET_TERMINALS
         });
 
+        if (bytes(projectUri).length != 0) {
+            _requirePermissionFrom({
+                account: projectOwner, projectId: projectId, permissionId: JBPermissionIds.SET_PROJECT_URI
+            });
+        }
+
         // Deploy the hook.
         hook = HOOK_DEPLOYER.deployHookFor({
             projectId: projectId,
@@ -147,7 +166,11 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
 
         // Launch the rulesets.
         rulesetId = _launchRulesetsFor({
-            projectId: projectId, launchRulesetsConfig: launchRulesetsConfig, dataHook: hook, controller: controller
+            projectId: projectId,
+            launchRulesetsConfig: launchRulesetsConfig,
+            projectUri: projectUri,
+            dataHook: hook,
+            controller: controller
         });
     }
 
@@ -196,24 +219,13 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
     }
 
     //*********************************************************************//
-    // -------------------------- internal views ------------------------- //
+    // ----------------------- external 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();
+    /// @notice Accepts project NFT reservations minted by `JBProjects.createFor`.
+    function onERC721Received(address, address from, uint256, bytes calldata) external view returns (bytes4) {
+        if (msg.sender != address(DIRECTORY.PROJECTS()) || from != address(0)) revert();
+        return IERC721Receiver.onERC721Received.selector;
     }
 
     //*********************************************************************//
@@ -221,12 +233,12 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
     //*********************************************************************//
 
     /// @notice Launches a project.
-    /// @param owner The address that will own the project.
+    /// @param projectId The ID of the reserved project.
     /// @param launchProjectConfig Configuration which dictates the behavior of the project which is being launched.
     /// @param dataHook The data hook to use for the project.
     /// @param controller The controller that the project's rulesets will be queued with.
     function _launchProjectFor(
-        address owner,
+        uint256 projectId,
         JBLaunchProjectConfig memory launchProjectConfig,
         IJB721TiersHook dataHook,
         IJBController controller
@@ -279,10 +291,10 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
             }
         }
 
-        // Launch the project.
+        // Launch the rulesets for the reserved project.
         // slither-disable-next-line unused-return
-        controller.launchProjectFor({
-            owner: owner,
+        controller.launchRulesetsFor({
+            projectId: projectId,
             projectUri: launchProjectConfig.projectUri,
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: launchProjectConfig.terminalConfigurations,
@@ -293,12 +305,14 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
     /// @notice Launches rulesets for a project.
     /// @param projectId The ID of the project to launch rulesets for.
     /// @param launchRulesetsConfig Configuration which dictates the behavior of the project's rulesets.
+    /// @param projectUri Metadata URI to associate with the project. Pass an empty string to leave it unchanged.
     /// @param dataHook The data hook to use for the project.
     /// @param controller The controller that the project's rulesets will be queued with.
     /// @return rulesetId The ID of the successfully created ruleset.
     function _launchRulesetsFor(
         uint256 projectId,
         JBLaunchRulesetsConfig memory launchRulesetsConfig,
+        string memory projectUri,
         IJB721TiersHook dataHook,
         IJBController controller
     )
@@ -352,12 +366,15 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
         }
 
         // Launch the rulesets.
-        return controller.launchRulesetsFor({
+        uint256 rulesetId = controller.launchRulesetsFor({
             projectId: projectId,
+            projectUri: projectUri,
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: launchRulesetsConfig.terminalConfigurations,
             memo: launchRulesetsConfig.memo
         });
+
+        return rulesetId;
     }
 
     /// @notice Queues rulesets for a project.
@@ -426,4 +443,25 @@ contract JB721TiersHookProjectDeployer is ERC2771Context, JBPermissioned, IJB721
             projectId: projectId, rulesetConfigurations: rulesetConfigurations, memo: queueRulesetsConfig.memo
         });
     }
+
+    //*********************************************************************//
+    // -------------------------- 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();
+    }
 }

package/src/JB721TiersHookStore.sol

@@ -725,9 +725,6 @@ 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];
 
@@ -1232,7 +1229,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
             if (storedTier.remainingSupply == 0) revert JB721TiersHookStore_InsufficientSupplyRemaining(tierId);
 
             // Mint the 721 — decrement remaining supply first so the reserve check below
-            // sees the post-mint state (this non-reserve mint may increase pending reserves).
+            // sees the correct post-mint non-reserve-mint count.
             unchecked {
                 // Keep a reference to its token ID.
                 tokenIds[i] = _generateTokenId({

package/src/interfaces/IJB721Checkpoints.sol

@@ -8,27 +8,34 @@ import {IJB721TiersHookStore} from "./IJB721TiersHookStore.sol";
 /// @dev Deployed as a clone via JB721CheckpointsDeployer during hook initialization. One module per hook.
 /// Pass this address to JBTokenDistributor as the IVotes token.
 interface IJB721Checkpoints is IERC5805 {
-    /// @notice Called by the hook after every NFT transfer to update checkpointed voting power.
-    /// @dev Looks up the token's tier voting units from the store internally.
-    /// Auto-self-delegates on first receive so checkpoints work without manual delegation.
-    /// @param from The previous owner (address(0) on mint).
-    /// @param to The new owner (address(0) on burn).
-    /// @param tokenId The token ID being transferred (used to look up tier voting units).
-    function onTransfer(address from, address to, uint256 tokenId) external;
-
-    /// @notice Initializes a cloned module with its hook and store references.
-    /// @dev Can only be called once. Called by the deployer after cloning.
-    /// @param hook The hook this module serves.
-    /// @param store The store that holds tier data for the hook's NFTs.
-    function initialize(address hook, IJB721TiersHookStore store) external;
-
     /// @notice The hook that this module tracks voting power for.
     /// @return The hook address.
     // forge-lint: disable-next-line(mixed-case-function)
     function HOOK() external view returns (address);
 
+    /// @notice The owner of an NFT at a past block.
+    /// @dev Mints do not write per-token checkpoint storage. Until a token's first non-mint transfer, ownership is
+    /// inferred from the hook's `firstOwnerOf`.
+    /// @param tokenId The token ID of the NFT to get the historical owner of.
+    /// @param blockNumber The block number to look up.
+    /// @return The owner of the token at `blockNumber`, or zero if the token has no known owner.
+    function ownerOfAt(uint256 tokenId, uint256 blockNumber) external view returns (address);
+
     /// @notice The store that holds tier and voting data for the hook's NFTs.
     /// @return The store contract.
     // forge-lint: disable-next-line(mixed-case-function)
     function STORE() external view returns (IJB721TiersHookStore);
+
+    /// @notice Initializes a cloned module with its hook reference.
+    /// @dev Can only be called once. Called by the deployer after cloning.
+    /// @param hook The hook this module serves.
+    function initialize(address hook) external;
+
+    /// @notice Called by the hook after every NFT transfer to update checkpointed voting power.
+    /// @dev Looks up the token's tier voting units from the store internally.
+    /// Auto-self-delegates on first receive so checkpoints work without manual delegation.
+    /// @param from The previous owner (address(0) on mint).
+    /// @param to The new owner (address(0) on burn).
+    /// @param tokenId The token ID being transferred (used to look up tier voting units).
+    function onTransfer(address from, address to, uint256 tokenId) external;
 }

package/src/interfaces/IJB721CheckpointsDeployer.sol

@@ -14,10 +14,14 @@ interface IJB721CheckpointsDeployer {
     // forge-lint: disable-next-line(mixed-case-function)
     function IMPLEMENTATION() external view returns (address);
 
+    /// @notice The store that holds tier and voting data for each hook's NFTs.
+    /// @return The store contract.
+    // forge-lint: disable-next-line(mixed-case-function)
+    function STORE() external view returns (IJB721TiersHookStore);
+
     /// @notice Deploys a new deterministic checkpoint clone for the given hook.
     /// @dev Uses CREATE2 with the hook address as salt so the clone address is the same across chains.
     /// @param hook The hook address the module will serve.
-    /// @param store The store that holds tier data for the hook's NFTs.
     /// @return module The newly deployed and initialized checkpoint module.
-    function deploy(address hook, IJB721TiersHookStore store) external returns (IJB721Checkpoints module);
+    function deploy(address hook) external returns (IJB721Checkpoints module);
 }

package/src/interfaces/IJB721TiersHookProjectDeployer.sol

@@ -43,6 +43,7 @@ interface IJB721TiersHookProjectDeployer {
     /// @param projectId The ID of the project that rulesets are being launched for.
     /// @param deployTiersHookConfig Configuration which dictates the behavior of the 721 tiers hook.
     /// @param launchRulesetsConfig Configuration which dictates the project's new rulesets.
+    /// @param projectUri Metadata URI to associate with the project. Pass an empty string to leave it unchanged.
     /// @param controller The controller that the project's rulesets will be queued with.
     /// @param salt A salt to use for the deterministic deployment.
     /// @return rulesetId The ID of the successfully created ruleset.
@@ -51,6 +52,7 @@ interface IJB721TiersHookProjectDeployer {
         uint256 projectId,
         JBDeploy721TiersHookConfig memory deployTiersHookConfig,
         JBLaunchRulesetsConfig memory launchRulesetsConfig,
+        string memory projectUri,
         IJBController controller,
         bytes32 salt
     )