@bananapus/omnichain-deployers-v6 0.0.25 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bananapus/omnichain-deployers-v6",
-    "version": "0.0.25",
+    "version": "0.0.26",
     "license": "MIT",
     "repository": {
         "type": "git",

package/src/JBOmnichainDeployer.sol

@@ -129,6 +129,246 @@ contract JBOmnichainDeployer is
         PERMISSIONS.setPermissionsFor({account: address(this), permissionsData: permissionData});
     }
 
+    //*********************************************************************//
+    // ---------------------- external transactions ---------------------- //
+    //*********************************************************************//
+
+    /// @notice Deploy new suckers for an existing project.
+    /// @dev Only the juicebox's owner or an operator with `JBPermissionIds.DEPLOY_SUCKERS` can call this entrypoint.
+    /// The downstream registry call also maps the configured tokens on each newly created sucker, so the same
+    /// end-to-end operation depends on the project's token-mapping authority being arranged for the registry.
+    /// @param projectId The ID of the project to deploy suckers for.
+    /// @param suckerDeploymentConfiguration The suckers to set up for the project.
+    function deploySuckersFor(
+        uint256 projectId,
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
+    )
+        external
+        override
+        returns (address[] memory suckers)
+    {
+        // Enforce permissions.
+        _requirePermissionFrom({
+            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.DEPLOY_SUCKERS
+        });
+
+        // Deploy the suckers.
+        // Note: the salt includes `_msgSender()` for replay protection. Cross-chain deterministic
+        // address matching requires using the same sender address on each chain.
+        // slither-disable-next-line unused-return
+        suckers = SUCKER_REGISTRY.deploySuckersFor({
+            projectId: projectId,
+            salt: keccak256(abi.encode(suckerDeploymentConfiguration.salt, _msgSender())),
+            configurations: suckerDeploymentConfiguration.deployerConfigurations
+        });
+    }
+
+    /// @notice Creates a project with a 721 tiers hook attached and with suckers.
+    /// @param owner The address to set as the owner of the project. The ERC-721 which confers this project's ownership
+    /// will be sent to this address.
+    /// @param projectUri The project's metadata URI.
+    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
+    /// @param rulesetConfigurations The rulesets to queue. Custom data hooks are read from each ruleset's metadata.
+    /// @param terminalConfigurations The terminals to set up for the project.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param suckerDeploymentConfiguration The suckers to set up for the project. Suckers facilitate cross-chain
+    /// token transfers between peer projects on different networks.
+    /// @param controller The controller to use for launching the project.
+    /// @return projectId The ID of the newly launched project.
+    /// @return hook The 721 tiers hook that was deployed for the project.
+    /// @return suckers The addresses of the deployed suckers.
+    function launchProjectFor(
+        address owner,
+        string calldata projectUri,
+        JBOmnichain721Config calldata deploy721Config,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        JBTerminalConfig[] calldata terminalConfigurations,
+        string calldata memo,
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers)
+    {
+        return _launchProjectFor({
+            owner: owner,
+            projectUri: projectUri,
+            deploy721Config: deploy721Config,
+            rulesetConfigurations: rulesetConfigurations,
+            terminalConfigurations: terminalConfigurations,
+            memo: memo,
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
+            controller: controller
+        });
+    }
+
+    /// @notice Creates a project with a default (empty-tier) 721 hook and with suckers.
+    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config.
+    /// @param owner The address to set as the owner of the project.
+    /// @param projectUri The project's metadata URI.
+    /// @param rulesetConfigurations The rulesets to queue.
+    /// @param terminalConfigurations The terminals to set up for the project.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param suckerDeploymentConfiguration The suckers to set up for the project.
+    /// @param controller The controller to use for launching the project.
+    /// @return projectId The ID of the newly launched project.
+    /// @return hook The 721 tiers hook that was deployed for the project.
+    /// @return suckers The addresses of the deployed suckers.
+    function launchProjectFor(
+        address owner,
+        string calldata projectUri,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        JBTerminalConfig[] calldata terminalConfigurations,
+        string calldata memo,
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers)
+    {
+        return _launchProjectFor({
+            owner: owner,
+            projectUri: projectUri,
+            deploy721Config: _default721Config(rulesetConfigurations),
+            rulesetConfigurations: rulesetConfigurations,
+            terminalConfigurations: terminalConfigurations,
+            memo: memo,
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
+            controller: controller
+        });
+    }
+
+    /// @notice Launches new rulesets for a project with a 721 tiers hook attached, using this contract as the data
+    /// hook.
+    /// @param projectId The ID of the project to launch the rulesets for.
+    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
+    /// @param rulesetConfigurations The rulesets to launch. Custom data hooks are read from each ruleset's metadata.
+    /// @param terminalConfigurations The terminals to set up for the project.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param controller The controller to use for launching the rulesets.
+    /// @return rulesetId The ID of the newly launched rulesets.
+    /// @return hook The 721 tiers hook that was deployed for the project.
+    function launchRulesetsFor(
+        uint256 projectId,
+        JBOmnichain721Config memory deploy721Config,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        JBTerminalConfig[] calldata terminalConfigurations,
+        string calldata memo,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 rulesetId, IJB721TiersHook hook)
+    {
+        return _launchRulesetsFor({
+            projectId: projectId,
+            deploy721Config: deploy721Config,
+            rulesetConfigurations: rulesetConfigurations,
+            terminalConfigurations: terminalConfigurations,
+            memo: memo,
+            controller: controller
+        });
+    }
+
+    /// @notice Launches new rulesets for a project with a default (empty-tier) 721 hook.
+    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config.
+    /// @param projectId The ID of the project to launch the rulesets for.
+    /// @param rulesetConfigurations The rulesets to launch.
+    /// @param terminalConfigurations The terminals to set up for the project.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param controller The controller to use for launching the rulesets.
+    /// @return rulesetId The ID of the newly launched rulesets.
+    /// @return hook The 721 tiers hook that was deployed for the project.
+    function launchRulesetsFor(
+        uint256 projectId,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        JBTerminalConfig[] calldata terminalConfigurations,
+        string calldata memo,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 rulesetId, IJB721TiersHook hook)
+    {
+        return _launchRulesetsFor({
+            projectId: projectId,
+            deploy721Config: _default721Config(rulesetConfigurations),
+            rulesetConfigurations: rulesetConfigurations,
+            terminalConfigurations: terminalConfigurations,
+            memo: memo,
+            controller: controller
+        });
+    }
+
+    /// @dev Make sure this contract can only receive project NFTs from `JBProjects`.
+    function onERC721Received(address, address, uint256, bytes calldata) external view returns (bytes4) {
+        // Make sure the 721 received is from the `JBProjects` contract.
+        if (msg.sender != address(PROJECTS)) revert JBOmnichainDeployer_UnexpectedNFTReceived();
+
+        return IERC721Receiver.onERC721Received.selector;
+    }
+
+    /// @notice Queues new rulesets for a project with a 721 tiers hook attached, using this contract as the data hook.
+    /// @dev If `deploy721Config.deployTiersHookConfig.tiersConfig.tiers.length > 0`, a new 721 hook is deployed.
+    /// Otherwise, the 721 hook from the latest ruleset is carried forward.
+    /// @param projectId The ID of the project to queue the rulesets for.
+    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
+    /// @param rulesetConfigurations The rulesets to queue. Custom data hooks are read from each ruleset's metadata.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param controller The controller to use for queuing the rulesets.
+    /// @return rulesetId The ID of the newly queued rulesets.
+    /// @return hook The 721 tiers hook (newly deployed or carried forward from the previous ruleset).
+    function queueRulesetsOf(
+        uint256 projectId,
+        JBOmnichain721Config memory deploy721Config,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        string calldata memo,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 rulesetId, IJB721TiersHook hook)
+    {
+        return _queueRulesetsOf({
+            projectId: projectId,
+            deploy721Config: deploy721Config,
+            rulesetConfigurations: rulesetConfigurations,
+            memo: memo,
+            controller: controller
+        });
+    }
+
+    /// @notice Queues new rulesets for a project with a default (empty-tier) 721 hook, carrying forward the existing
+    /// hook.
+    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config. With 0 tiers in
+    /// the default config, the existing hook is always carried forward.
+    /// @param projectId The ID of the project to queue the rulesets for.
+    /// @param rulesetConfigurations The rulesets to queue.
+    /// @param memo A memo to pass along to the emitted event.
+    /// @param controller The controller to use for queuing the rulesets.
+    /// @return rulesetId The ID of the newly queued rulesets.
+    /// @return hook The 721 tiers hook carried forward from the previous ruleset.
+    function queueRulesetsOf(
+        uint256 projectId,
+        JBRulesetConfig[] memory rulesetConfigurations,
+        string calldata memo,
+        IJBController controller
+    )
+        external
+        override
+        returns (uint256 rulesetId, IJB721TiersHook hook)
+    {
+        return _queueRulesetsOf({
+            projectId: projectId,
+            deploy721Config: _default721Config(rulesetConfigurations),
+            rulesetConfigurations: rulesetConfigurations,
+            memo: memo,
+            controller: controller
+        });
+    }
+
     //*********************************************************************//
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
@@ -171,7 +411,9 @@ contract JBOmnichainDeployer is
         // Compute the cross-chain surplus: local surplus + sum of known peer chain surpluses.
         // This prevents disproportionate reclaim when tokens bridge away but surplus stays.
         effectiveSurplusValue = context.surplus.value
-            + SUCKER_REGISTRY.remoteSurplusOf(context.projectId, 18, uint256(uint160(context.surplus.token)));
+            + SUCKER_REGISTRY.remoteSurplusOf({
+                projectId: context.projectId, decimals: 18, currency: uint256(uint160(context.surplus.token))
+            });
 
         // Will hold the 721 hook's cash out specifications (always 0 or 1 element).
         JBCashOutHookSpecification[] memory tiered721HookSpecifications;
@@ -278,385 +520,122 @@ contract JBOmnichainDeployer is
 
         // The amount entering the project after tier splits.
         uint256 projectAmount = totalSplitAmount >= context.amount.value ? 0 : context.amount.value - totalSplitAmount;
-
-        // Get the custom data hook's weight and specs. Reduce the amount so it only considers funds entering the
-        // project, and pass the 721 hook's weight so the data hook sees the split-adjusted weight.
-        JBPayHookSpecification[] memory dataHookSpecs;
-        bool customHookCalled;
-        {
-            JBDeployerHookConfig memory extraHook = _extraDataHookOf[context.projectId][context.rulesetId];
-            if (address(extraHook.dataHook) != address(0) && extraHook.useDataHookForPay) {
-                JBBeforePayRecordedContext memory hookContext = context;
-                hookContext.amount.value = projectAmount;
-                // Pass the 721 hook's weight (which accounts for split deductions) so the data hook
-                // makes its decisions (e.g. mint-vs-swap) based on the correct post-split weight.
-                if (has721Hook) hookContext.weight = tiered721Weight;
-                (weight, dataHookSpecs) = extraHook.dataHook.beforePayRecordedWith(hookContext);
-                customHookCalled = true;
-            }
-        }
-
-        if (!customHookCalled) {
-            // Use the 721 hook's weight directly (already scaled for splits) or fall back to context weight.
-            weight = has721Hook ? tiered721Weight : context.weight;
-        }
-
-        // Merge specifications: 721 hook spec first, then data hook specs.
-        bool hasDataHookSpecs = dataHookSpecs.length > 0;
-        if (!hasTiered721Spec && !hasDataHookSpecs) return (weight, hookSpecifications);
-
-        hookSpecifications = new JBPayHookSpecification[]((hasTiered721Spec ? 1 : 0) + dataHookSpecs.length);
-
-        uint256 specIndex;
-        if (hasTiered721Spec) hookSpecifications[specIndex++] = tiered721HookSpec;
-        for (uint256 i; i < dataHookSpecs.length; i++) {
-            hookSpecifications[specIndex + i] = dataHookSpecs[i];
-        }
-    }
-
-    /// @notice Get the extra data hook for a project and ruleset.
-    /// @param projectId The ID of the project to get the extra data hook for.
-    /// @param rulesetId The ID of the ruleset to get the extra data hook for.
-    /// @return hook The extra data hook configured for the project/ruleset.
-    function extraDataHookOf(
-        uint256 projectId,
-        uint256 rulesetId
-    )
-        external
-        view
-        override
-        returns (JBDeployerHookConfig memory hook)
-    {
-        return _extraDataHookOf[projectId][rulesetId];
-    }
-
-    /// @notice A flag indicating whether an address has permission to mint a project's tokens on-demand.
-    /// @dev A project's data hook can allow any address to mint its tokens.
-    /// @param projectId The ID of the project whose token can be minted.
-    /// @param ruleset The ruleset to check the token minting permission of.
-    /// @param addr The address to check the token minting permission of.
-    /// @return flag A flag indicating whether the address has permission to mint the project's tokens on-demand.
-    function hasMintPermissionFor(
-        uint256 projectId,
-        JBRuleset memory ruleset,
-        address addr
-    )
-        external
-        view
-        override
-        returns (bool)
-    {
-        // Suckers always get mint permission.
-        if (SUCKER_REGISTRY.isSuckerOf({projectId: projectId, addr: addr})) return true;
-
-        // Check the extra data hook (the 721 hook doesn't grant mint permission).
-        JBDeployerHookConfig memory extraHook = _extraDataHookOf[projectId][ruleset.id];
-        if (address(extraHook.dataHook) != address(0)) {
-            if (extraHook.dataHook.hasMintPermissionFor({projectId: projectId, ruleset: ruleset, addr: addr})) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /// @notice Get the tiered 721 hook config for a project and ruleset.
-    /// @param projectId The ID of the project to get the 721 hook for.
-    /// @param rulesetId The ID of the ruleset to get the 721 hook for.
-    /// @return hook The 721 tiers hook.
-    /// @return useDataHookForCashOut Whether the 721 hook is used for cash outs.
-    function tiered721HookOf(
-        uint256 projectId,
-        uint256 rulesetId
-    )
-        external
-        view
-        override
-        returns (IJB721TiersHook hook, bool useDataHookForCashOut)
-    {
-        JBTiered721HookConfig memory config = _tiered721HookOf[projectId][rulesetId];
-        return (config.hook, config.useDataHookForCashOut);
-    }
-
-    //*********************************************************************//
-    // -------------------------- public views --------------------------- //
-    //*********************************************************************//
-
-    /// @notice Indicates if this contract adheres to the specified interface.
-    /// @dev See `IERC165.supportsInterface`.
-    /// @return A flag indicating if the provided interface ID is supported.
-    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return interfaceId == type(IJBOmnichainDeployer).interfaceId
-            || interfaceId == type(IJBRulesetDataHook).interfaceId || interfaceId == type(IERC721Receiver).interfaceId
-            || interfaceId == type(IERC165).interfaceId;
-    }
-
-    //*********************************************************************//
-    // --------------------- external transactions ----------------------- //
-    //*********************************************************************//
-
-    /// @notice Deploy new suckers for an existing project.
-    /// @dev Only the juicebox's owner or an operator with `JBPermissionIds.DEPLOY_SUCKERS` can call this entrypoint.
-    /// The downstream registry call also maps the configured tokens on each newly created sucker, so the same
-    /// end-to-end operation depends on the project's token-mapping authority being arranged for the registry.
-    /// @param projectId The ID of the project to deploy suckers for.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the project.
-    function deploySuckersFor(
-        uint256 projectId,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
-    )
-        external
-        override
-        returns (address[] memory suckers)
-    {
-        // Enforce permissions.
-        _requirePermissionFrom({
-            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.DEPLOY_SUCKERS
-        });
-
-        // Deploy the suckers.
-        // Note: the salt includes `_msgSender()` for replay protection. Cross-chain deterministic
-        // address matching requires using the same sender address on each chain.
-        // slither-disable-next-line unused-return
-        suckers = SUCKER_REGISTRY.deploySuckersFor({
-            projectId: projectId,
-            salt: keccak256(abi.encode(suckerDeploymentConfiguration.salt, _msgSender())),
-            configurations: suckerDeploymentConfiguration.deployerConfigurations
-        });
-    }
-
-    /// @notice Creates a project with a 721 tiers hook attached and with suckers.
-    /// @param owner The address to set as the owner of the project. The ERC-721 which confers this project's ownership
-    /// will be sent to this address.
-    /// @param projectUri The project's metadata URI.
-    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
-    /// @param rulesetConfigurations The rulesets to queue. Custom data hooks are read from each ruleset's metadata.
-    /// @param terminalConfigurations The terminals to set up for the project.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the project. Suckers facilitate cross-chain
-    /// token transfers between peer projects on different networks.
-    /// @param controller The controller to use for launching the project.
-    /// @return projectId The ID of the newly launched project.
-    /// @return hook The 721 tiers hook that was deployed for the project.
-    /// @return suckers The addresses of the deployed suckers.
-    function launchProjectFor(
-        address owner,
-        string calldata projectUri,
-        JBOmnichain721Config calldata deploy721Config,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
-    )
-        external
-        override
-        returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers)
-    {
-        return _launchProjectFor({
-            owner: owner,
-            projectUri: projectUri,
-            deploy721Config: deploy721Config,
-            rulesetConfigurations: rulesetConfigurations,
-            terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            controller: controller
-        });
-    }
-
-    /// @notice Creates a project with a default (empty-tier) 721 hook and with suckers.
-    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config.
-    /// @param owner The address to set as the owner of the project.
-    /// @param projectUri The project's metadata URI.
-    /// @param rulesetConfigurations The rulesets to queue.
-    /// @param terminalConfigurations The terminals to set up for the project.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the project.
-    /// @param controller The controller to use for launching the project.
-    /// @return projectId The ID of the newly launched project.
-    /// @return hook The 721 tiers hook that was deployed for the project.
-    /// @return suckers The addresses of the deployed suckers.
-    function launchProjectFor(
-        address owner,
-        string calldata projectUri,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
-    )
-        external
-        override
-        returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers)
-    {
-        return _launchProjectFor({
-            owner: owner,
-            projectUri: projectUri,
-            deploy721Config: _default721Config(rulesetConfigurations),
-            rulesetConfigurations: rulesetConfigurations,
-            terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            controller: controller
-        });
+
+        // Get the custom data hook's weight and specs. Reduce the amount so it only considers funds entering the
+        // project, and pass the 721 hook's weight so the data hook sees the split-adjusted weight.
+        JBPayHookSpecification[] memory dataHookSpecs;
+        bool customHookCalled;
+        {
+            JBDeployerHookConfig memory extraHook = _extraDataHookOf[context.projectId][context.rulesetId];
+            if (address(extraHook.dataHook) != address(0) && extraHook.useDataHookForPay) {
+                JBBeforePayRecordedContext memory hookContext = context;
+                hookContext.amount.value = projectAmount;
+                // Pass the 721 hook's weight (which accounts for split deductions) so the data hook
+                // makes its decisions (e.g. mint-vs-swap) based on the correct post-split weight.
+                if (has721Hook) hookContext.weight = tiered721Weight;
+                (weight, dataHookSpecs) = extraHook.dataHook.beforePayRecordedWith(hookContext);
+                customHookCalled = true;
+            }
+        }
+
+        if (!customHookCalled) {
+            // Use the 721 hook's weight directly (already scaled for splits) or fall back to context weight.
+            weight = has721Hook ? tiered721Weight : context.weight;
+        }
+
+        // Merge specifications: 721 hook spec first, then data hook specs.
+        bool hasDataHookSpecs = dataHookSpecs.length > 0;
+        if (!hasTiered721Spec && !hasDataHookSpecs) return (weight, hookSpecifications);
+
+        hookSpecifications = new JBPayHookSpecification[]((hasTiered721Spec ? 1 : 0) + dataHookSpecs.length);
+
+        uint256 specIndex;
+        if (hasTiered721Spec) hookSpecifications[specIndex++] = tiered721HookSpec;
+        for (uint256 i; i < dataHookSpecs.length; i++) {
+            hookSpecifications[specIndex + i] = dataHookSpecs[i];
+        }
     }
 
-    /// @notice Launches new rulesets for a project with a 721 tiers hook attached, using this contract as the data
-    /// hook.
-    /// @param projectId The ID of the project to launch the rulesets for.
-    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
-    /// @param rulesetConfigurations The rulesets to launch. Custom data hooks are read from each ruleset's metadata.
-    /// @param terminalConfigurations The terminals to set up for the project.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param controller The controller to use for launching the rulesets.
-    /// @return rulesetId The ID of the newly launched rulesets.
-    /// @return hook The 721 tiers hook that was deployed for the project.
-    function launchRulesetsFor(
+    /// @notice Get the extra data hook for a project and ruleset.
+    /// @param projectId The ID of the project to get the extra data hook for.
+    /// @param rulesetId The ID of the ruleset to get the extra data hook for.
+    /// @return hook The extra data hook configured for the project/ruleset.
+    function extraDataHookOf(
         uint256 projectId,
-        JBOmnichain721Config memory deploy721Config,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        uint256 rulesetId
     )
         external
+        view
         override
-        returns (uint256 rulesetId, IJB721TiersHook hook)
+        returns (JBDeployerHookConfig memory hook)
     {
-        return _launchRulesetsFor({
-            projectId: projectId,
-            deploy721Config: deploy721Config,
-            rulesetConfigurations: rulesetConfigurations,
-            terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            controller: controller
-        });
+        return _extraDataHookOf[projectId][rulesetId];
     }
 
-    /// @notice Launches new rulesets for a project with a default (empty-tier) 721 hook.
-    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config.
-    /// @param projectId The ID of the project to launch the rulesets for.
-    /// @param rulesetConfigurations The rulesets to launch.
-    /// @param terminalConfigurations The terminals to set up for the project.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param controller The controller to use for launching the rulesets.
-    /// @return rulesetId The ID of the newly launched rulesets.
-    /// @return hook The 721 tiers hook that was deployed for the project.
-    function launchRulesetsFor(
+    /// @notice A flag indicating whether an address has permission to mint a project's tokens on-demand.
+    /// @dev A project's data hook can allow any address to mint its tokens.
+    /// @param projectId The ID of the project whose token can be minted.
+    /// @param ruleset The ruleset to check the token minting permission of.
+    /// @param addr The address to check the token minting permission of.
+    /// @return flag A flag indicating whether the address has permission to mint the project's tokens on-demand.
+    function hasMintPermissionFor(
         uint256 projectId,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        JBRuleset memory ruleset,
+        address addr
     )
         external
+        view
         override
-        returns (uint256 rulesetId, IJB721TiersHook hook)
+        returns (bool)
     {
-        return _launchRulesetsFor({
-            projectId: projectId,
-            deploy721Config: _default721Config(rulesetConfigurations),
-            rulesetConfigurations: rulesetConfigurations,
-            terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            controller: controller
-        });
-    }
-
-    /// @dev Make sure this contract can only receive project NFTs from `JBProjects`.
-    function onERC721Received(address, address, uint256, bytes calldata) external view returns (bytes4) {
-        // Make sure the 721 received is from the `JBProjects` contract.
-        if (msg.sender != address(PROJECTS)) revert JBOmnichainDeployer_UnexpectedNFTReceived();
+        // Suckers always get mint permission.
+        if (SUCKER_REGISTRY.isSuckerOf({projectId: projectId, addr: addr})) return true;
 
-        return IERC721Receiver.onERC721Received.selector;
-    }
+        // Check the extra data hook (the 721 hook doesn't grant mint permission).
+        JBDeployerHookConfig memory extraHook = _extraDataHookOf[projectId][ruleset.id];
+        if (address(extraHook.dataHook) != address(0)) {
+            if (extraHook.dataHook.hasMintPermissionFor({projectId: projectId, ruleset: ruleset, addr: addr})) {
+                return true;
+            }
+        }
 
-    /// @notice Queues new rulesets for a project with a 721 tiers hook attached, using this contract as the data hook.
-    /// @dev If `deploy721Config.deployTiersHookConfig.tiersConfig.tiers.length > 0`, a new 721 hook is deployed.
-    /// Otherwise, the 721 hook from the latest ruleset is carried forward.
-    /// @param projectId The ID of the project to queue the rulesets for.
-    /// @param deploy721Config The 721 hook deployment config (hook config + cash-out flag + salt).
-    /// @param rulesetConfigurations The rulesets to queue. Custom data hooks are read from each ruleset's metadata.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param controller The controller to use for queuing the rulesets.
-    /// @return rulesetId The ID of the newly queued rulesets.
-    /// @return hook The 721 tiers hook (newly deployed or carried forward from the previous ruleset).
-    function queueRulesetsOf(
-        uint256 projectId,
-        JBOmnichain721Config memory deploy721Config,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        string calldata memo,
-        IJBController controller
-    )
-        external
-        override
-        returns (uint256 rulesetId, IJB721TiersHook hook)
-    {
-        return _queueRulesetsOf({
-            projectId: projectId,
-            deploy721Config: deploy721Config,
-            rulesetConfigurations: rulesetConfigurations,
-            memo: memo,
-            controller: controller
-        });
+        return false;
     }
 
-    /// @notice Queues new rulesets for a project with a default (empty-tier) 721 hook, carrying forward the existing
-    /// hook.
-    /// @dev Uses `baseCurrency` from the first ruleset and `decimals = 18` for the default 721 config. With 0 tiers in
-    /// the default config, the existing hook is always carried forward.
-    /// @param projectId The ID of the project to queue the rulesets for.
-    /// @param rulesetConfigurations The rulesets to queue.
-    /// @param memo A memo to pass along to the emitted event.
-    /// @param controller The controller to use for queuing the rulesets.
-    /// @return rulesetId The ID of the newly queued rulesets.
-    /// @return hook The 721 tiers hook carried forward from the previous ruleset.
-    function queueRulesetsOf(
+    /// @notice Get the tiered 721 hook config for a project and ruleset.
+    /// @param projectId The ID of the project to get the 721 hook for.
+    /// @param rulesetId The ID of the ruleset to get the 721 hook for.
+    /// @return hook The 721 tiers hook.
+    /// @return useDataHookForCashOut Whether the 721 hook is used for cash outs.
+    function tiered721HookOf(
         uint256 projectId,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        string calldata memo,
-        IJBController controller
+        uint256 rulesetId
     )
         external
+        view
         override
-        returns (uint256 rulesetId, IJB721TiersHook hook)
+        returns (IJB721TiersHook hook, bool useDataHookForCashOut)
     {
-        return _queueRulesetsOf({
-            projectId: projectId,
-            deploy721Config: _default721Config(rulesetConfigurations),
-            rulesetConfigurations: rulesetConfigurations,
-            memo: memo,
-            controller: controller
-        });
+        JBTiered721HookConfig memory config = _tiered721HookOf[projectId][rulesetId];
+        return (config.hook, config.useDataHookForCashOut);
     }
 
     //*********************************************************************//
-    // -------------------------- internal views ------------------------ //
-    //*********************************************************************//
-
-    //*********************************************************************//
-    // ------------------------ internal functions ----------------------- //
+    // -------------------------- public 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 Indicates if this contract adheres to the specified interface.
+    /// @dev See `IERC165.supportsInterface`.
+    /// @return A flag indicating if the provided interface ID is supported.
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+        return interfaceId == type(IJBOmnichainDeployer).interfaceId
+            || interfaceId == type(IJBRulesetDataHook).interfaceId || interfaceId == type(IERC721Receiver).interfaceId
+            || interfaceId == type(IERC165).interfaceId;
     }
 
-    /// @notice Returns a default `JBOmnichain721Config` with `currency` from the first ruleset's `baseCurrency`,
-    /// `decimals = 18`, empty tiers, no cash-out handling, and no salt.
-    /// @param rulesetConfigurations The ruleset configurations to derive defaults from.
-    /// @return config The default 721 config.
-    function _default721Config(JBRulesetConfig[] memory rulesetConfigurations)
-        internal
-        pure
-        returns (JBOmnichain721Config memory config)
-    {
-        if (rulesetConfigurations.length == 0) revert JBOmnichainDeployer_NoRulesetConfigurations();
-        config.deployTiersHookConfig.tiersConfig.currency = rulesetConfigurations[0].metadata.baseCurrency;
-        config.deployTiersHookConfig.tiersConfig.decimals = 18;
-    }
+    //*********************************************************************//
+    // ---------------------- internal transactions ---------------------- //
+    //*********************************************************************//
 
     /// @notice Deploys a 721 tiers hook for a project.
     /// @dev The caller is responsible for transferring ownership to the project via
@@ -782,18 +761,6 @@ contract JBOmnichainDeployer is
         });
     }
 
-    /// @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 Internal implementation of `queueRulesetsOf`.
     function _queueRulesetsOf(
         uint256 projectId,
@@ -914,6 +881,41 @@ contract JBOmnichainDeployer is
         return rulesetConfigurations;
     }
 
+    //*********************************************************************//
+    // ----------------------- 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 Returns a default `JBOmnichain721Config` with `currency` from the first ruleset's `baseCurrency`,
+    /// `decimals = 18`, empty tiers, no cash-out handling, and no salt.
+    /// @param rulesetConfigurations The ruleset configurations to derive defaults from.
+    /// @return config The default 721 config.
+    function _default721Config(JBRulesetConfig[] memory rulesetConfigurations)
+        internal
+        pure
+        returns (JBOmnichain721Config memory config)
+    {
+        if (rulesetConfigurations.length == 0) revert JBOmnichainDeployer_NoRulesetConfigurations();
+        config.deployTiersHookConfig.tiersConfig.currency = rulesetConfigurations[0].metadata.baseCurrency;
+        config.deployTiersHookConfig.tiersConfig.decimals = 18;
+    }
+
+    /// @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 Validates that the provided controller matches the project's controller in the directory.
     /// @dev The reflexive lookup (controller.DIRECTORY().controllerOf()) is intentional — it confirms the
     /// caller-provided controller is the one the directory recognizes for this project, preventing a