@bananapus/721-hook-v6 0.0.50 → 0.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.50",
+  "version": "0.0.52",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
   },
   "dependencies": {
     "@bananapus/address-registry-v6": "^0.0.25",
-    "@bananapus/core-v6": "^0.0.53",
-    "@bananapus/ownable-v6": "^0.0.24",
-    "@bananapus/permission-ids-v6": "^0.0.22",
+    "@bananapus/core-v6": "^0.0.54",
+    "@bananapus/ownable-v6": "^0.0.25",
+    "@bananapus/permission-ids-v6": "^0.0.25",
     "@openzeppelin/contracts": "5.6.1",
     "@prb/math": "4.1.1",
     "solady": "0.1.26"

package/script/Deploy.s.sol

@@ -24,20 +24,14 @@ contract DeployScript is Script, Sphinx {
     AddressRegistryDeployment registry;
 
     /// @notice The address that is allowed to forward calls to the terminal and controller on a users behalf.
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address private TRUSTED_FORWARDER;
+    address private trustedForwarder;
 
     /// @notice the salts that are used to deploy the contracts.
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 HOOK_SALT = "JB721TiersHookV6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 HOOK_DEPLOYER_SALT = "JB721TiersHookDeployerV6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 HOOK_STORE_SALT = "JB721TiersHookStoreV6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 PROJECT_DEPLOYER_SALT = "JB721TiersHookProjectDeployerV6";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 CHECKPOINTS_DEPLOYER_SALT = "JB721CheckpointsDeployerV6";
+    bytes32 private constant _HOOK_SALT = "JB721TiersHookV6_";
+    bytes32 private constant _HOOK_DEPLOYER_SALT = "JB721TiersHookDeployerV6_";
+    bytes32 private constant _HOOK_STORE_SALT = "JB721TiersHookStoreV6_";
+    bytes32 private constant _PROJECT_DEPLOYER_SALT = "JB721TiersHookProjectDeployerV6";
+    bytes32 private constant _CHECKPOINTS_DEPLOYER_SALT = "JB721CheckpointsDeployerV6";
 
     function configureSphinx() public override {
         sphinxConfig.projectName = "nana-721-hook-v6";
@@ -53,7 +47,7 @@ contract DeployScript is Script, Sphinx {
         );
 
         // We use the same trusted forwarder as the core deployment.
-        TRUSTED_FORWARDER = core.permissions.trustedForwarder();
+        trustedForwarder = core.permissions.trustedForwarder();
 
         registry = AddressRegistryDeploymentLib.getDeployment(
             vm.envOr(
@@ -74,25 +68,25 @@ contract DeployScript is Script, Sphinx {
         {
             // Perform the check for the store.
             (address _store, bool _storeIsDeployed) = _isDeployed({
-                salt: HOOK_STORE_SALT, creationCode: type(JB721TiersHookStore).creationCode, arguments: ""
+                salt: _HOOK_STORE_SALT, creationCode: type(JB721TiersHookStore).creationCode, arguments: ""
             });
 
             // Deploy it if it has not been deployed yet.
-            store = !_storeIsDeployed ? new JB721TiersHookStore{salt: HOOK_STORE_SALT}() : JB721TiersHookStore(_store);
+            store = !_storeIsDeployed ? new JB721TiersHookStore{salt: _HOOK_STORE_SALT}() : JB721TiersHookStore(_store);
         }
 
         JB721CheckpointsDeployer checkpointsDeployer;
         {
             // Perform the check for the deployer.
             (address _deployer, bool _deployerIsDeployed) = _isDeployed({
-                salt: CHECKPOINTS_DEPLOYER_SALT,
+                salt: _CHECKPOINTS_DEPLOYER_SALT,
                 creationCode: type(JB721CheckpointsDeployer).creationCode,
                 arguments: abi.encode(store)
             });
 
             // Deploy it if it has not been deployed yet.
             checkpointsDeployer = !_deployerIsDeployed
-                ? new JB721CheckpointsDeployer{salt: CHECKPOINTS_DEPLOYER_SALT}(store)
+                ? new JB721CheckpointsDeployer{salt: _CHECKPOINTS_DEPLOYER_SALT}(store)
                 : JB721CheckpointsDeployer(_deployer);
         }
 
@@ -100,7 +94,7 @@ contract DeployScript is Script, Sphinx {
         {
             // Perform the check for the registry.
             (address _hook, bool _hookIsDeployed) = _isDeployed({
-                salt: HOOK_SALT,
+                salt: _HOOK_SALT,
                 creationCode: type(JB721TiersHook).creationCode,
                 arguments: abi.encode(
                     core.directory,
@@ -110,22 +104,22 @@ contract DeployScript is Script, Sphinx {
                     store,
                     core.splits,
                     checkpointsDeployer,
-                    TRUSTED_FORWARDER
+                    trustedForwarder
                 )
             });
 
             // Deploy it if it has not been deployed yet.
             hook = !_hookIsDeployed
-                ? new JB721TiersHook{salt: HOOK_SALT}(
-                    core.directory,
-                    core.permissions,
-                    core.prices,
-                    core.rulesets,
-                    store,
-                    core.splits,
-                    IJB721CheckpointsDeployer(address(checkpointsDeployer)),
-                    TRUSTED_FORWARDER
-                )
+                ? new JB721TiersHook{salt: _HOOK_SALT}({
+                    directory: core.directory,
+                    permissions: core.permissions,
+                    prices: core.prices,
+                    rulesets: core.rulesets,
+                    store: store,
+                    splits: core.splits,
+                    checkpointsDeployer: IJB721CheckpointsDeployer(address(checkpointsDeployer)),
+                    trustedForwarder: trustedForwarder
+                })
                 : JB721TiersHook(_hook);
         }
 
@@ -133,15 +127,15 @@ contract DeployScript is Script, Sphinx {
         {
             // Perform the check for the registry.
             (address _hookDeployer, bool _hookDeployerIsDeployed) = _isDeployed({
-                salt: HOOK_DEPLOYER_SALT,
+                salt: _HOOK_DEPLOYER_SALT,
                 creationCode: type(JB721TiersHookDeployer).creationCode,
-                arguments: abi.encode(hook, store, registry.registry, TRUSTED_FORWARDER)
+                arguments: abi.encode(hook, store, registry.registry, trustedForwarder)
             });
 
             hookDeployer = !_hookDeployerIsDeployed
-                ? new JB721TiersHookDeployer{salt: HOOK_DEPLOYER_SALT}(
-                    hook, store, registry.registry, TRUSTED_FORWARDER
-                )
+                ? new JB721TiersHookDeployer{salt: _HOOK_DEPLOYER_SALT}({
+                    hook: hook, store: store, addressRegistry: registry.registry, trustedForwarder: trustedForwarder
+                })
                 : JB721TiersHookDeployer(_hookDeployer);
         }
 
@@ -149,15 +143,18 @@ contract DeployScript is Script, Sphinx {
         {
             // Perform the check for the registry.
             (address _projectDeployer, bool _projectDeployerIsdeployed) = _isDeployed({
-                salt: PROJECT_DEPLOYER_SALT,
+                salt: _PROJECT_DEPLOYER_SALT,
                 creationCode: type(JB721TiersHookProjectDeployer).creationCode,
-                arguments: abi.encode(core.directory, core.permissions, hookDeployer, TRUSTED_FORWARDER)
+                arguments: abi.encode(core.directory, core.permissions, hookDeployer, trustedForwarder)
             });
 
             projectDeployer = !_projectDeployerIsdeployed
-                ? new JB721TiersHookProjectDeployer{salt: PROJECT_DEPLOYER_SALT}(
-                    core.directory, core.permissions, hookDeployer, TRUSTED_FORWARDER
-                )
+                ? new JB721TiersHookProjectDeployer{salt: _PROJECT_DEPLOYER_SALT}({
+                    directory: core.directory,
+                    permissions: core.permissions,
+                    hookDeployer: hookDeployer,
+                    trustedForwarder: trustedForwarder
+                })
                 : JB721TiersHookProjectDeployer(_projectDeployer);
         }
     }

package/script/helpers/Hook721DeploymentLib.sol

@@ -11,10 +11,8 @@ import {IJB721TiersHookProjectDeployer} from "../../src/interfaces/IJB721TiersHo
 import {IJB721TiersHookStore} from "../../src/interfaces/IJB721TiersHookStore.sol";
 
 struct Hook721Deployment {
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IJB721TiersHookDeployer hook_deployer;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IJB721TiersHookProjectDeployer project_deployer;
+    IJB721TiersHookDeployer hookDeployer;
+    IJB721TiersHookProjectDeployer projectDeployer;
     IJB721TiersHookStore store;
 }
 
@@ -25,17 +23,16 @@ library Hook721DeploymentLib {
     Vm internal constant vm = Vm(VM_ADDRESS);
 
     function getDeployment(string memory path) internal returns (Hook721Deployment memory deployment) {
-        // get chainId for which we need to get the deployment.
+        // Match the current chain ID to the Sphinx network name used in deployment artifacts.
         uint256 chainId = block.chainid;
 
-        // Deploy to get the constants.
-        // TODO: get constants without deploy.
+        // `SphinxConstants` exposes Sphinx's supported chain ID to network name mapping.
         SphinxConstants sphinxConstants = new SphinxConstants();
         NetworkInfo[] memory networks = sphinxConstants.getNetworkInfoArray();
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment({path: path, network_name: networks[_i].name});
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -44,27 +41,26 @@ library Hook721DeploymentLib {
 
     function getDeployment(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (Hook721Deployment memory deployment)
     {
-        deployment.hook_deployer = IJB721TiersHookDeployer(
+        deployment.hookDeployer = IJB721TiersHookDeployer(
             _getDeploymentAddress({
                 path: path,
-                project_name: "nana-721-hook-v6",
-                network_name: network_name,
+                projectName: "nana-721-hook-v6",
+                networkName: networkName,
                 contractName: "JB721TiersHookDeployer"
             })
         );
 
-        deployment.project_deployer = IJB721TiersHookProjectDeployer(
+        deployment.projectDeployer = IJB721TiersHookProjectDeployer(
             _getDeploymentAddress({
                 path: path,
-                project_name: "nana-721-hook-v6",
-                network_name: network_name,
+                projectName: "nana-721-hook-v6",
+                networkName: networkName,
                 contractName: "JB721TiersHookProjectDeployer"
             })
         );
@@ -72,8 +68,8 @@ library Hook721DeploymentLib {
         deployment.store = IJB721TiersHookStore(
             _getDeploymentAddress({
                 path: path,
-                project_name: "nana-721-hook-v6",
-                network_name: network_name,
+                projectName: "nana-721-hook-v6",
+                networkName: networkName,
                 contractName: "JB721TiersHookStore"
             })
         );
@@ -86,10 +82,8 @@ library Hook721DeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory project_name,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -98,7 +92,7 @@ library Hook721DeploymentLib {
     {
         string memory deploymentJson =
         // forge-lint: disable-next-line(unsafe-cheatcode)
-        vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
-        return stdJson.readAddress(deploymentJson, ".address");
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }

package/src/JB721Checkpoints.sol

@@ -40,7 +40,7 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     //*********************************************************************//
 
     /// @notice The hook that this module tracks voting power for.
-    address public override HOOK;
+    address public override hook;
 
     //*********************************************************************//
     // -------------------- internal stored properties ------------------- //
@@ -59,7 +59,7 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     /// @param store The store that holds tier data for each hook's NFTs.
     constructor(IJB721TiersHookStore store) EIP712("JB721Checkpoints", "1") {
         STORE = store;
-        HOOK = address(1);
+        hook = address(1);
     }
 
     //*********************************************************************//
@@ -81,7 +81,7 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
             uint256 tokenId = tokenIds[i];
 
             // Only the current owner can enroll their tokens.
-            if (IERC721(HOOK).ownerOf(tokenId) != msg.sender) {
+            if (IERC721(hook).ownerOf(tokenId) != msg.sender) {
                 revert JB721Checkpoints_NotOwner({tokenId: tokenId, caller: msg.sender});
             }
 
@@ -99,20 +99,20 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
 
     /// @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 override {
-        if (HOOK != address(0)) revert JB721Checkpoints_AlreadyInitialized({hook: HOOK});
+    /// @param hookAddress The hook this module serves.
+    function initialize(address hookAddress) external override {
+        if (hook != address(0)) revert JB721Checkpoints_AlreadyInitialized({hook: hook});
         // `hook` cannot be zero when called through the deployer because `msg.sender` must equal `hook`.
-        HOOK = hook;
+        hook = hookAddress;
     }
 
     /// @notice Called by the hook after every NFT transfer to update checkpointed voting power.
-    /// @dev Only callable by the HOOK. Looks up the token's tier voting units from the store.
+    /// @dev Only callable by the hook. Looks up the token's tier voting units from the store.
     /// @param from The previous owner (address(0) on mint).
     /// @param to The new owner (address(0) on burn).
     /// @param tokenId The token ID to transfer.
     function onTransfer(address from, address to, uint256 tokenId) external override {
-        if (msg.sender != HOOK) revert JB721Checkpoints_Unauthorized({caller: msg.sender, hook: HOOK});
+        if (msg.sender != hook) revert JB721Checkpoints_Unauthorized({caller: msg.sender, hook: hook});
 
         if (from != address(0)) {
             // forge-lint: disable-next-line(unsafe-typecast)
@@ -120,7 +120,7 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
         }
 
         // Look up this token's tier to get its voting units.
-        uint256 votingUnits = STORE.tierOfTokenId({hook: HOOK, tokenId: tokenId, includeResolvedUri: false}).votingUnits;
+        uint256 votingUnits = STORE.tierOfTokenId({hook: hook, tokenId: tokenId, includeResolvedUri: false}).votingUnits;
 
         // Move checkpointed voting power from the previous owner to the new owner.
         _transferVotingUnits({from: from, to: to, amount: votingUnits});
@@ -161,6 +161,6 @@ contract JB721Checkpoints is Votes, IJB721Checkpoints {
     /// @param account The address to get the voting units of.
     /// @return The total voting units the account holds.
     function _getVotingUnits(address account) internal view override returns (uint256) {
-        return STORE.votingUnitsOf({hook: HOOK, account: account});
+        return STORE.votingUnitsOf({hook: hook, account: account});
     }
 }

package/src/JB721TiersHook.sol

@@ -107,7 +107,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
 
     /// @notice The checkpoint module that manages IVotes-compatible checkpointed voting power for this hook's NFTs.
     /// @dev Lazily deployed on the first transfer. Pass this to JBTokenDistributor as the IVotes token.
-    IJB721Checkpoints public override CHECKPOINTS;
+    IJB721Checkpoints public override checkpoints;
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
@@ -232,9 +232,9 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @notice Initialize a cloned copy of the hook. Sets the project association, ERC-721 name/symbol, pricing
     /// context (currency + decimals), metadata URIs, initial tiers, and behavioral flags. Can only be called once
     /// per clone — the implementation contract is pre-initialized in its constructor to prevent misuse.
-    /// @dev Called by `JB721TiersHookDeployer` immediately after cloning. Reverts with
-    /// `JB721TiersHook_AlreadyInitialized` if called more than once, or `JB721TiersHook_NoProjectId` if projectId is 0.
-    /// @param projectId The ID of the project this hook is associated with.
+    /// @dev Called by `JB721TiersHookDeployer` immediately after cloning. Reverts if called more than once or if the
+    /// project ID is zero.
+    /// @param initialProjectId The ID of the project this hook is associated with.
     /// @param name The name of the NFT collection.
     /// @param symbol The symbol representing the NFT collection.
     /// @param baseUri The URI to use as a base for full NFT `tokenUri`s.
@@ -244,7 +244,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// category (from least to greatest).
     /// @param flags A set of additional options which dictate how the hook behaves.
     function initialize(
-        uint256 projectId,
+        uint256 initialProjectId,
         string memory name,
         string memory symbol,
         string memory baseUri,
@@ -258,14 +258,14 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     {
         // Stop re-initialization. This protects both the implementation contract (initialized in constructor)
         // and clones (initialized via this function).
-        if (_initialized) revert JB721TiersHook_AlreadyInitialized(PROJECT_ID);
+        if (_initialized) revert JB721TiersHook_AlreadyInitialized({projectId: projectId});
         _initialized = true;
 
-        // Make sure a projectId is provided.
-        if (projectId == 0) revert JB721TiersHook_NoProjectId({projectId: projectId});
+        // Make sure a project ID is provided.
+        if (initialProjectId == 0) revert JB721TiersHook_NoProjectId({projectId: initialProjectId});
 
         // Initialize the superclass.
-        JB721Hook._initialize({projectId: projectId, name: name, symbol: symbol});
+        JB721Hook._initialize({initialProjectId: initialProjectId, name: name, symbol: symbol});
 
         // Validate pricing decimals are within a reasonable range.
         if (tiersConfig.decimals > 18) revert JB721TiersHook_InvalidPricingDecimals(tiersConfig.decimals);
@@ -326,7 +326,8 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @return The token URI from the `tokenUriResolver` if it is set. If it isn't set, the token URI for the NFT's
     /// tier.
     function tokenURI(uint256 tokenId) public view virtual override returns (string memory) {
-        return JB721TiersHookLib.resolveTokenURI(STORE, address(this), baseURI, tokenId);
+        return
+            JB721TiersHookLib.resolveTokenURI({store: STORE, hook: address(this), baseUri: baseURI, tokenId: tokenId});
     }
 
     /// @notice The total cash-out weight across all outstanding NFTs and pending reserves. This is the denominator
@@ -348,15 +349,13 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @param tierIdsToRemove The IDs of the tiers to remove.
     function adjustTiers(JB721TierConfig[] calldata tiersToAdd, uint256[] calldata tierIdsToRemove) external override {
         // Enforce permissions.
-        _requirePermissionFrom({
-            account: owner(), projectId: PROJECT_ID, permissionId: JBPermissionIds.ADJUST_721_TIERS
-        });
+        _requirePermissionFrom({account: owner(), projectId: projectId, permissionId: JBPermissionIds.ADJUST_721_TIERS});
 
         // Delegate to the library (via DELEGATECALL) for tier removal, addition, event emission, and split setting.
         JB721TiersHookLib.adjustTiersFor({
             store: STORE,
             splits: SPLITS,
-            projectId: PROJECT_ID,
+            projectId: projectId,
             hookAddress: address(this),
             caller: _msgSender(),
             tiersToAdd: tiersToAdd,
@@ -379,7 +378,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         returns (uint256[] memory tokenIds)
     {
         // Enforce permissions.
-        _requirePermissionFrom({account: owner(), projectId: PROJECT_ID, permissionId: JBPermissionIds.MINT_721});
+        _requirePermissionFrom({account: owner(), projectId: projectId, permissionId: JBPermissionIds.MINT_721});
 
         // Record the mint. The token IDs returned correspond to the tiers passed in.
         (tokenIds,,) = STORE.recordMint({
@@ -417,7 +416,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     function setDiscountPercentOf(uint256 tierId, uint256 discountPercent) external override {
         // Enforce permissions.
         _requirePermissionFrom({
-            account: owner(), projectId: PROJECT_ID, permissionId: JBPermissionIds.SET_721_DISCOUNT_PERCENT
+            account: owner(), projectId: projectId, permissionId: JBPermissionIds.SET_721_DISCOUNT_PERCENT
         });
         _setDiscountPercentOf({tierId: tierId, discountPercent: discountPercent});
     }
@@ -428,7 +427,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     function setDiscountPercentsOf(JB721TiersSetDiscountPercentConfig[] calldata configs) external override {
         // Enforce permissions.
         _requirePermissionFrom({
-            account: owner(), projectId: PROJECT_ID, permissionId: JBPermissionIds.SET_721_DISCOUNT_PERCENT
+            account: owner(), projectId: projectId, permissionId: JBPermissionIds.SET_721_DISCOUNT_PERCENT
         });
 
         for (uint256 i; i < configs.length;) {
@@ -453,24 +452,22 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @param tokenUriResolver The new URI resolver. Pass `IJB721TokenUriResolver(address(this))` as a sentinel value
     /// to leave unchanged. `address(this)` is used instead of `address(0)` because `address(0)` is a valid value that
     /// clears the resolver.
-    /// @param encodedIPFSUriTierId The ID of the tier to set the encoded IPFS URI of.
-    /// @param encodedIPFSUri The encoded IPFS URI to set.
+    /// @param encodedIpfsUriTierId The ID of the tier to set the encoded IPFS URI of.
+    /// @param encodedIpfsUri The encoded IPFS URI to set.
     function setMetadata(
         string calldata name,
         string calldata symbol,
         string calldata baseUri,
         string calldata contractUri,
         IJB721TokenUriResolver tokenUriResolver,
-        uint256 encodedIPFSUriTierId,
-        bytes32 encodedIPFSUri
+        uint256 encodedIpfsUriTierId,
+        bytes32 encodedIpfsUri
     )
         external
         override
     {
         // Enforce permissions.
-        _requirePermissionFrom({
-            account: owner(), projectId: PROJECT_ID, permissionId: JBPermissionIds.SET_721_METADATA
-        });
+        _requirePermissionFrom({account: owner(), projectId: projectId, permissionId: JBPermissionIds.SET_721_METADATA});
 
         // Cache _msgSender() at function entry to avoid repeated calls.
         address caller = _msgSender();
@@ -501,11 +498,11 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
             // Store the new URI resolver.
             _recordSetTokenUriResolver(tokenUriResolver);
         }
-        if (encodedIPFSUriTierId != 0 && encodedIPFSUri != bytes32(0)) {
-            emit SetEncodedIPFSUri({tierId: encodedIPFSUriTierId, encodedUri: encodedIPFSUri, caller: caller});
+        if (encodedIpfsUriTierId != 0 && encodedIpfsUri != bytes32(0)) {
+            emit SetEncodedIpfsUri({tierId: encodedIpfsUriTierId, encodedUri: encodedIpfsUri, caller: caller});
 
             // Store the new encoded IPFS URI.
-            STORE.recordSetEncodedIPFSUriOf({tierId: encodedIPFSUriTierId, encodedIPFSUri: encodedIPFSUri});
+            STORE.recordSetEncodedIpfsUriOf({tierId: encodedIpfsUriTierId, encodedIpfsUri: encodedIpfsUri});
         }
     }
 
@@ -519,12 +516,12 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
     /// @param count The number of reserved NFTs to mint.
     function mintPendingReservesFor(uint256 tierId, uint256 count) public override {
         // Get a reference to the project's current ruleset.
-        JBRuleset memory ruleset = _currentRulesetOf(PROJECT_ID);
+        JBRuleset memory ruleset = _currentRulesetOf(projectId);
 
         // Pending reserve mints must not be paused.
         if (JB721TiersRulesetMetadataResolver.mintPendingReservesPaused((JBRulesetMetadataResolver.metadata(ruleset))))
         {
-            revert JB721TiersHook_MintReserveNftsPaused({projectId: PROJECT_ID, tierId: tierId});
+            revert JB721TiersHook_MintReserveNftsPaused({projectId: projectId, tierId: tierId});
         }
 
         // Record the reserved mint for the tier.
@@ -694,7 +691,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         (value, valid) = JB721TiersHookLib.normalizePaymentValue({
             packedPricingContext: _packedPricingContext,
             prices: PRICES,
-            projectId: PROJECT_ID,
+            projectId: projectId,
             amountValue: context.amount.value,
             amountCurrency: context.amount.currency,
             amountDecimals: context.amount.decimals
@@ -722,7 +719,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
             JB721TiersHookLib.distributeAll({
                 directory: DIRECTORY,
                 splits: SPLITS,
-                projectId: PROJECT_ID,
+                projectId: projectId,
                 hookAddress: address(this),
                 token: context.forwardedAmount.token,
                 amount: context.forwardedAmount.value,
@@ -766,7 +763,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
             // If transfers are pausable, check if they're paused.
             if (transfersPausable) {
                 // Get a reference to the project's current ruleset.
-                JBRuleset memory ruleset = _currentRulesetOf(PROJECT_ID);
+                JBRuleset memory ruleset = _currentRulesetOf(projectId);
 
                 // If transfers are paused and the NFT isn't being transferred to the zero address, revert.
                 if (
@@ -776,7 +773,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
                         )
                 ) {
                     revert JB721TiersHook_TierTransfersPaused({
-                        projectId: PROJECT_ID, tokenId: tokenId, from: from, to: to
+                        projectId: projectId, tokenId: tokenId, from: from, to: to
                     });
                 }
             }
@@ -789,11 +786,11 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         STORE.recordTransferForTier({tierId: tierId, from: from, to: to});
 
         // Deploy the checkpoint module lazily on the first transfer.
-        if (address(CHECKPOINTS) == address(0)) {
-            CHECKPOINTS = CHECKPOINTS_DEPLOYER.deploy(address(this));
+        if (address(checkpoints) == address(0)) {
+            checkpoints = CHECKPOINTS_DEPLOYER.deploy(address(this));
         }
 
         // Notify the checkpoint module to update checkpointed voting power.
-        CHECKPOINTS.onTransfer({from: from, to: to, tokenId: tokenId});
+        checkpoints.onTransfer({from: from, to: to, tokenId: tokenId});
     }
 }

package/src/JB721TiersHookDeployer.sol

@@ -89,7 +89,7 @@ contract JB721TiersHookDeployer is ERC2771Context, IJB721TiersHookDeployer {
         emit HookDeployed({projectId: projectId, hook: newHook, caller: _msgSender()});
 
         newHook.initialize({
-            projectId: projectId,
+            initialProjectId: projectId,
             name: deployTiersHookConfig.name,
             symbol: deployTiersHookConfig.symbol,
             baseUri: deployTiersHookConfig.baseUri,

package/src/JB721TiersHookProjectDeployer.sol

@@ -89,8 +89,8 @@ contract JB721TiersHookProjectDeployer is
         returns (uint256 projectId, IJB721TiersHook hook)
     {
         // Reserve the project ID up front so permissionless project creations cannot invalidate hook deployment.
-        IJBProjects PROJECTS = DIRECTORY.PROJECTS();
-        projectId = PROJECTS.createFor(address(this));
+        IJBProjects projects = DIRECTORY.PROJECTS();
+        projectId = projects.createFor(address(this));
 
         // Deploy the hook.
         hook = HOOK_DEPLOYER.deployHookFor({
@@ -108,7 +108,7 @@ contract JB721TiersHookProjectDeployer is
         JBOwnable(address(hook)).transferOwnershipToProject(projectId);
 
         // Transfer the project NFT to its intended owner.
-        PROJECTS.safeTransferFrom({from: address(this), to: owner, tokenId: projectId});
+        projects.safeTransferFrom({from: address(this), to: owner, tokenId: projectId});
     }
 
     /// @notice Launches rulesets for a project with an attached 721 tiers hook.
@@ -135,8 +135,8 @@ contract JB721TiersHookProjectDeployer is
         returns (uint256 rulesetId, IJB721TiersHook hook)
     {
         // Get the project's projects contract.
-        IJBProjects PROJECTS = DIRECTORY.PROJECTS();
-        address projectOwner = PROJECTS.ownerOf(projectId);
+        IJBProjects projects = DIRECTORY.PROJECTS();
+        address projectOwner = projects.ownerOf(projectId);
 
         // Enforce permissions.
         _requirePermissionFrom({
@@ -277,7 +277,6 @@ contract JB721TiersHookProjectDeployer is
                     ownerMustSendPayouts: payDataRulesetConfig.metadata.ownerMustSendPayouts,
                     holdFees: payDataRulesetConfig.metadata.holdFees,
                     scopeCashOutsToLocalBalances: payDataRulesetConfig.metadata.scopeCashOutsToLocalBalances,
-                    pauseCrossProjectFeeFreeInflows: payDataRulesetConfig.metadata.pauseCrossProjectFeeFreeInflows,
                     useDataHookForPay: true,
                     useDataHookForCashOut: payDataRulesetConfig.metadata.useDataHookForCashOut,
                     dataHook: address(dataHook),
@@ -352,7 +351,6 @@ contract JB721TiersHookProjectDeployer is
                     ownerMustSendPayouts: payDataRulesetConfig.metadata.ownerMustSendPayouts,
                     holdFees: payDataRulesetConfig.metadata.holdFees,
                     scopeCashOutsToLocalBalances: payDataRulesetConfig.metadata.scopeCashOutsToLocalBalances,
-                    pauseCrossProjectFeeFreeInflows: payDataRulesetConfig.metadata.pauseCrossProjectFeeFreeInflows,
                     useDataHookForPay: true,
                     useDataHookForCashOut: payDataRulesetConfig.metadata.useDataHookForCashOut,
                     dataHook: address(dataHook),
@@ -428,7 +426,6 @@ contract JB721TiersHookProjectDeployer is
                     ownerMustSendPayouts: payDataRulesetConfig.metadata.ownerMustSendPayouts,
                     holdFees: payDataRulesetConfig.metadata.holdFees,
                     scopeCashOutsToLocalBalances: payDataRulesetConfig.metadata.scopeCashOutsToLocalBalances,
-                    pauseCrossProjectFeeFreeInflows: payDataRulesetConfig.metadata.pauseCrossProjectFeeFreeInflows,
                     useDataHookForPay: true,
                     useDataHookForCashOut: payDataRulesetConfig.metadata.useDataHookForCashOut,
                     dataHook: address(dataHook),