@bananapus/omnichain-deployers-v6 0.0.45 → 0.0.47

package/package.json

@@ -1,18 +1,16 @@
 {
   "name": "@bananapus/omnichain-deployers-v6",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Bananapus/nana-omnichain-deployers-v6"
   },
   "files": [
-    "CHANGELOG.md",
     "foundry.toml",
     "references/",
     "remappings.txt",
-    "script/Deploy.s.sol",
-    "script/helpers/",
+    "script/",
     "src/"
   ],
   "engines": {
@@ -26,16 +24,16 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-omnichain-deployers-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.51",
-    "@bananapus/core-v6": "^0.0.54",
-    "@bananapus/ownable-v6": "^0.0.25",
-    "@bananapus/permission-ids-v6": "^0.0.25",
-    "@bananapus/suckers-v6": "^0.0.47",
+    "@bananapus/721-hook-v6": "^0.0.54",
+    "@bananapus/core-v6": "^0.0.57",
+    "@bananapus/ownable-v6": "^0.0.27",
+    "@bananapus/permission-ids-v6": "^0.0.26",
+    "@bananapus/suckers-v6": "^0.0.49",
     "@openzeppelin/contracts": "5.6.1"
   },
   "devDependencies": {
-    "@bananapus/address-registry-v6": "^0.0.25",
-    "@bananapus/buyback-hook-v6": "^0.0.47",
+    "@bananapus/address-registry-v6": "^0.0.26",
+    "@bananapus/buyback-hook-v6": "^0.0.49",
     "@sphinx-labs/plugins": "0.33.3",
     "@uniswap/v4-core": "1.0.2"
   }

package/script/Deploy.s.sol

@@ -8,7 +8,6 @@ import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpe
 import {Hook721Deployment, Hook721DeploymentLib} from "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
 import {SuckerDeployment, SuckerDeploymentLib} from "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
 
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {JBOmnichainDeployer} from "src/JBOmnichainDeployer.sol";
 
 contract Deploy is Script, Sphinx {
@@ -62,21 +61,15 @@ contract Deploy is Script, Sphinx {
                 salt: NANA_OMNICHAIN_DEPLOYER_SALT,
                 creationCode: type(JBOmnichainDeployer).creationCode,
                 arguments: abi.encode(
-                    suckers.registry,
-                    hook.hook_deployer,
-                    core.permissions,
-                    core.projects,
-                    core.directory,
-                    core.trustedForwarder
+                    suckers.registry, hook.hookDeployer, core.permissions, core.controller, core.trustedForwarder
                 ),
                 deployer: safeAddress()
             })) {
             new JBOmnichainDeployer{salt: NANA_OMNICHAIN_DEPLOYER_SALT}({
                 suckerRegistry: suckers.registry,
-                hookDeployer: hook.hook_deployer,
+                hookDeployer: hook.hookDeployer,
                 permissions: core.permissions,
-                projects: core.projects,
-                directory: IJBDirectory(address(core.directory)),
+                controller: core.controller,
                 trustedForwarder: core.trustedForwarder
             });
         }

package/src/JBOmnichainDeployer.sol

@@ -56,7 +56,7 @@ contract JBOmnichainDeployer is
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    /// @notice Thrown when the provided controller does not match the project's controller in the directory.
+    /// @notice Thrown when a project is not using this deployer's canonical controller.
     error JBOmnichainDeployer_ControllerMismatch(
         uint256 projectId, address expectedController, address actualController
     );
@@ -82,19 +82,21 @@ contract JBOmnichainDeployer is
     // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
 
-    /// @notice Mints ERC-721s that represent Juicebox project ownership and transfers.
-    IJBProjects public immutable PROJECTS;
+    /// @notice The canonical controller used for every project launch and ruleset queue.
+    IJBController public immutable override CONTROLLER;
+
+    /// @notice The directory used to confirm existing projects still use this deployer's canonical controller.
+    IJBDirectory public immutable DIRECTORY;
 
     /// @notice Deploys tiered ERC-721 hooks for projects.
     IJB721TiersHookDeployer public immutable HOOK_DEPLOYER;
 
+    /// @notice Mints ERC-721s that represent Juicebox project ownership and transfers.
+    IJBProjects public immutable PROJECTS;
+
     /// @notice Deploys and tracks suckers for projects.
     IJBSuckerRegistry public immutable SUCKER_REGISTRY;
 
-    /// @notice The directory used to validate controllers. Stored as immutable to prevent a user-provided
-    /// controller from returning a fake directory that confirms itself.
-    IJBDirectory public immutable DIRECTORY;
-
     //*********************************************************************//
     // -------------------- internal stored properties ------------------- //
     //*********************************************************************//
@@ -116,24 +118,23 @@ contract JBOmnichainDeployer is
     /// @param suckerRegistry The registry to use for deploying and tracking each project's suckers.
     /// @param hookDeployer The deployer to use for project's tiered ERC-721 hooks.
     /// @param permissions The permissions to use for the contract.
-    /// @param projects The projects to use for the contract.
-    /// @param directory The directory used to validate controllers against a trusted source.
+    /// @param controller The controller to use for every project launch and ruleset queue.
     /// @param trustedForwarder The trusted forwarder for the ERC2771Context.
     constructor(
         IJBSuckerRegistry suckerRegistry,
         IJB721TiersHookDeployer hookDeployer,
         IJBPermissions permissions,
-        IJBProjects projects,
-        IJBDirectory directory,
+        IJBController controller,
         address trustedForwarder
     )
         JBPermissioned(permissions)
         ERC2771Context(trustedForwarder)
     {
-        PROJECTS = projects;
+        CONTROLLER = controller;
+        PROJECTS = controller.PROJECTS();
         SUCKER_REGISTRY = suckerRegistry;
         HOOK_DEPLOYER = hookDeployer;
-        DIRECTORY = directory;
+        DIRECTORY = controller.DIRECTORY();
 
         // Give the sucker registry permission to map tokens for all revnets.
         uint8[] memory permissionIds = new uint8[](1);
@@ -193,7 +194,6 @@ contract JBOmnichainDeployer is
     /// @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.
@@ -204,8 +204,7 @@ contract JBOmnichainDeployer is
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
         string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         external
         override
@@ -218,8 +217,7 @@ contract JBOmnichainDeployer is
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: terminalConfigurations,
             memo: memo,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            controller: controller
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
     }
 
@@ -231,7 +229,6 @@ contract JBOmnichainDeployer is
     /// @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.
@@ -241,8 +238,7 @@ contract JBOmnichainDeployer is
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
         string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         external
         override
@@ -255,8 +251,7 @@ contract JBOmnichainDeployer is
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: terminalConfigurations,
             memo: memo,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            controller: controller
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
     }
 
@@ -268,7 +263,6 @@ contract JBOmnichainDeployer is
     /// @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(
@@ -277,8 +271,7 @@ contract JBOmnichainDeployer is
         JBOmnichain721Config memory deploy721Config,
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         external
         override
@@ -290,8 +283,7 @@ contract JBOmnichainDeployer is
             deploy721Config: deploy721Config,
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            controller: controller
+            memo: memo
         });
     }
 
@@ -302,7 +294,6 @@ contract JBOmnichainDeployer is
     /// @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(
@@ -310,8 +301,7 @@ contract JBOmnichainDeployer is
         string calldata projectUri,
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         external
         override
@@ -323,8 +313,7 @@ contract JBOmnichainDeployer is
             deploy721Config: _default721Config(rulesetConfigurations),
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: terminalConfigurations,
-            memo: memo,
-            controller: controller
+            memo: memo
         });
     }
 
@@ -345,15 +334,13 @@ contract JBOmnichainDeployer is
     /// @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
+        string calldata memo
     )
         external
         override
@@ -363,8 +350,7 @@ contract JBOmnichainDeployer is
             projectId: projectId,
             deploy721Config: deploy721Config,
             rulesetConfigurations: rulesetConfigurations,
-            memo: memo,
-            controller: controller
+            memo: memo
         });
     }
 
@@ -375,14 +361,12 @@ contract JBOmnichainDeployer is
     /// @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
+        string calldata memo
     )
         external
         override
@@ -392,8 +376,7 @@ contract JBOmnichainDeployer is
             projectId: projectId,
             deploy721Config: _default721Config(rulesetConfigurations),
             rulesetConfigurations: rulesetConfigurations,
-            memo: memo,
-            controller: controller
+            memo: memo
         });
     }
 
@@ -428,7 +411,8 @@ contract JBOmnichainDeployer is
         )
     {
         // If the cash out is from a sucker, bypass all taxes and fees.
-        // Pass through the local surplus so the reclaim calculation can compute the pro-rata share.
+        // Sucker cash-outs are the bridge accounting path: the value moving out of this chain must stay proportional
+        // to this chain's local backing. Do not add remote supply/surplus here.
         if (SUCKER_REGISTRY.isSuckerOf({projectId: context.projectId, addr: context.holder})) {
             return (0, context.cashOutCount, context.totalSupply, context.surplus.value, hookSpecifications);
         }
@@ -457,8 +441,10 @@ contract JBOmnichainDeployer is
         // Look up the 721 hook configured for this project's ruleset.
         JBTiered721HookConfig memory tiered721Config = _tiered721HookOf[context.projectId][context.rulesetId];
 
+        bool hasTiered721CashOut = address(tiered721Config.hook) != address(0) && tiered721Config.useDataHookForCashOut;
+
         // If a 721 hook is set and opted into cash out handling, let it adjust the cash out parameters.
-        if (address(tiered721Config.hook) != address(0) && tiered721Config.useDataHookForCashOut) {
+        if (hasTiered721CashOut) {
             // Forward to the 721 hook. It may change the tax rate, count, and return hook specs.
             // Capture the 721 hook's totalSupply and effectiveSurplusValue — NFT cash-outs should use
             // local-only denominators so holders reclaim against local surplus, not omnichain surplus.
@@ -473,7 +459,10 @@ contract JBOmnichainDeployer is
         JBDeployerHookConfig memory extraHook = _extraDataHookOf[context.projectId][context.rulesetId];
 
         // If an extra hook is set and opted into cash out handling, let it adjust the cash out parameters.
-        if (address(extraHook.dataHook) != address(0) && extraHook.useDataHookForCashOut) {
+        // NFT cash-outs are excluded: the terminal later passes the original fungible burn count to after-hooks,
+        // while the 721 hook expresses pricing as NFT cash-out weight. Generic cash-out hooks cannot safely execute
+        // against that derived count.
+        if (!hasTiered721CashOut && address(extraHook.dataHook) != address(0) && extraHook.useDataHookForCashOut) {
             // Build a mutable copy of the context with the latest values (possibly updated by the 721 hook).
             JBBeforeCashOutRecordedContext memory hookContext = context;
             hookContext.cashOutTaxRate = cashOutTaxRate;
@@ -482,17 +471,10 @@ contract JBOmnichainDeployer is
             hookContext.surplus.value = effectiveSurplusValue;
 
             // Forward to the extra hook. It may further change the tax rate and return hook specs.
-            // We always discard totalSupply and effectiveSurplusValue — this contract computes
-            // cross-chain values for both. When the 721 hook is active, we also discard cashOutCount
-            // because the 721 hook redefines both cashOutCount and totalSupply as NFT cash-out weights
-            // (sum of tier prices), not fungible token counts. Letting the extra hook override
-            // cashOutCount would corrupt NFT pricing in the bonding curve.
-            if (address(tiered721Config.hook) != address(0) && tiered721Config.useDataHookForCashOut) {
-                (cashOutTaxRate,,,, extraHookSpecifications) = extraHook.dataHook.beforeCashOutRecordedWith(hookContext);
-            } else {
-                (cashOutTaxRate, cashOutCount,,, extraHookSpecifications) =
-                    extraHook.dataHook.beforeCashOutRecordedWith(hookContext);
-            }
+            // We always discard totalSupply and effectiveSurplusValue — this contract computes cross-chain values
+            // for both.
+            (cashOutTaxRate, cashOutCount,,, extraHookSpecifications) =
+                extraHook.dataHook.beforeCashOutRecordedWith(hookContext);
         }
 
         // If neither hook returned any specifications, return the adjusted values with no hook specs.
@@ -715,9 +697,8 @@ contract JBOmnichainDeployer is
         override
         returns (uint256 supply, uint256 surplus, uint256 balance)
     {
-        // Get the current ruleset to look up the stored extra hook.
-        IJBController controller = IJBController(address(DIRECTORY.controllerOf(projectId)));
-        (JBRuleset memory ruleset,) = controller.currentRulesetOf(projectId);
+        // Get the current ruleset from the canonical controller to look up the stored extra hook.
+        (JBRuleset memory ruleset,) = CONTROLLER.currentRulesetOf(projectId);
 
         // Look up the extra data hook for this project's current ruleset.
         JBDeployerHookConfig memory extraHook = _extraDataHookOf[projectId][ruleset.id];
@@ -784,8 +765,7 @@ contract JBOmnichainDeployer is
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
         string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         internal
         returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers)
@@ -793,6 +773,9 @@ contract JBOmnichainDeployer is
         // Reserve the project ID up front so permissionless project creations cannot invalidate hook deployment.
         projectId = PROJECTS.createFor(address(this));
 
+        // A fresh project can start without a controller, but it must not already be assigned elsewhere.
+        _requireController({projectId: projectId, allowUnset: true});
+
         // Deploy a 721 hook and set up rulesets.
         hook = _deploy721Hook({projectId: projectId, config: deploy721Config});
         rulesetConfigurations = _setup721({
@@ -803,7 +786,7 @@ contract JBOmnichainDeployer is
         });
 
         // Launch the rulesets for the reserved project.
-        controller.launchRulesetsFor({
+        CONTROLLER.launchRulesetsFor({
             projectId: projectId,
             projectUri: projectUri,
             rulesetConfigurations: rulesetConfigurations,
@@ -811,6 +794,9 @@ contract JBOmnichainDeployer is
             memo: memo
         });
 
+        // A fresh launch must leave the directory pointing at this deployer's canonical controller.
+        _requireController({projectId: projectId, allowUnset: false});
+
         // Transfer the hook's ownership to the project (now that the project NFT has been minted).
         JBOwnable(address(hook)).transferOwnershipToProject(projectId);
 
@@ -835,8 +821,7 @@ contract JBOmnichainDeployer is
         JBOmnichain721Config memory deploy721Config,
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         internal
         returns (uint256 rulesetId, IJB721TiersHook hook)
@@ -855,8 +840,8 @@ contract JBOmnichainDeployer is
             });
         }
 
-        // Validate that the controller matches the project's controller in the directory.
-        _validateController({projectId: projectId, controller: controller});
+        // Existing projects must still be controlled by this deployer's canonical controller.
+        _requireController({projectId: projectId, allowUnset: true});
 
         // Deploy a 721 hook, transfer its ownership to the project, and set up rulesets.
         hook = _deploy721Hook({projectId: projectId, config: deploy721Config});
@@ -869,13 +854,16 @@ contract JBOmnichainDeployer is
         });
 
         // Configure the rulesets.
-        rulesetId = controller.launchRulesetsFor({
+        rulesetId = CONTROLLER.launchRulesetsFor({
             projectId: projectId,
             projectUri: projectUri,
             rulesetConfigurations: rulesetConfigurations,
             terminalConfigurations: terminalConfigurations,
             memo: memo
         });
+
+        // A blank project launch must leave the directory pointing at this deployer's canonical controller.
+        _requireController({projectId: projectId, allowUnset: false});
     }
 
     /// @notice Internal implementation of `queueRulesetsOf`.
@@ -883,8 +871,7 @@ contract JBOmnichainDeployer is
         uint256 projectId,
         JBOmnichain721Config memory deploy721Config,
         JBRulesetConfig[] memory rulesetConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         internal
         returns (uint256 rulesetId, IJB721TiersHook hook)
@@ -894,12 +881,12 @@ contract JBOmnichainDeployer is
             account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.QUEUE_RULESETS
         });
 
-        // Validate that the controller matches the project's controller in the directory.
-        _validateController({projectId: projectId, controller: controller});
+        // Existing projects must still be controlled by this deployer's canonical controller.
+        _requireController({projectId: projectId, allowUnset: true});
 
         // Revert if the project already had rulesets queued in this block, which would make our
         // `block.timestamp + i` ruleset ID prediction incorrect.
-        uint256 latestRulesetId = controller.RULESETS().latestRulesetIdOf(projectId);
+        uint256 latestRulesetId = CONTROLLER.RULESETS().latestRulesetIdOf(projectId);
         // forge-lint: disable-next-line(block-timestamp)
         uint256 currentTimestamp = block.timestamp;
         if (latestRulesetId >= currentTimestamp) {
@@ -926,7 +913,7 @@ contract JBOmnichainDeployer is
                 // excluded because hook selection is irreversible — if the pending ruleset is later rejected
                 // by the approval hook, we'd have locked in a hook from a ruleset that never became active.
                 (JBRuleset memory latestQueued, JBApprovalStatus approvalStatus) =
-                    controller.RULESETS().latestQueuedOf(projectId);
+                    CONTROLLER.RULESETS().latestQueuedOf(projectId);
                 if (
                     latestQueued.id != 0
                         && (approvalStatus == JBApprovalStatus.Approved || approvalStatus == JBApprovalStatus.Empty)
@@ -935,7 +922,7 @@ contract JBOmnichainDeployer is
                     sourceRulesetId = latestQueued.id;
                 } else {
                     // Fall back to the current (active, approved) ruleset.
-                    sourceRulesetId = controller.RULESETS().currentOf(projectId).id;
+                    sourceRulesetId = CONTROLLER.RULESETS().currentOf(projectId).id;
                 }
             }
             JBTiered721HookConfig memory previousConfig = _tiered721HookOf[projectId][sourceRulesetId];
@@ -959,7 +946,7 @@ contract JBOmnichainDeployer is
         });
 
         // Configure the rulesets.
-        rulesetId = controller.queueRulesetsOf({
+        rulesetId = CONTROLLER.queueRulesetsOf({
             projectId: projectId, rulesetConfigurations: rulesetConfigurations, memo: memo
         });
     }
@@ -1055,17 +1042,17 @@ contract JBOmnichainDeployer is
         return ERC2771Context._msgSender();
     }
 
-    /// @notice Validates that the provided controller matches the project's controller in the directory.
-    /// @dev Uses the immutable DIRECTORY instead of querying the controller, preventing a malicious
-    /// controller from returning a fake directory that confirms itself.
-    /// @param projectId The ID of the project to validate the controller for.
-    /// @param controller The controller to validate.
-    function _validateController(uint256 projectId, IJBController controller) internal view {
+    /// @notice Revert unless the trusted directory records `CONTROLLER` for `projectId`.
+    /// @dev Use `allowUnset = true` as a pre-launch check: a fresh project with no controller wired yet is accepted.
+    /// Use `allowUnset = false` as a post-launch check: `CONTROLLER` must be live in the directory.
+    /// @param projectId The ID of the project to check.
+    /// @param allowUnset Whether `address(0)` (no controller assigned yet) is treated as valid.
+    function _requireController(uint256 projectId, bool allowUnset) internal view {
         address current = address(DIRECTORY.controllerOf(projectId));
-        // Allow address(0) for fresh projects that haven't launched rulesets yet.
-        if (current != address(0) && current != address(controller)) {
+        if (allowUnset && current == address(0)) return;
+        if (current != address(CONTROLLER)) {
             revert JBOmnichainDeployer_ControllerMismatch({
-                projectId: projectId, expectedController: current, actualController: address(controller)
+                projectId: projectId, expectedController: address(CONTROLLER), actualController: current
             });
         }
     }

package/src/interfaces/IJBOmnichainDeployer.sol

@@ -14,6 +14,9 @@ import {JBSuckerDeploymentConfig} from "../structs/JBSuckerDeploymentConfig.sol"
 /// hook and cross-chain suckers, then serves as the data hook wrapper that coordinates pay/cash-out logic across all
 /// chains.
 interface IJBOmnichainDeployer {
+    /// @notice The controller used for every project launch and ruleset queue.
+    function CONTROLLER() external view returns (IJBController);
+
     /// @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.
@@ -61,7 +64,6 @@ interface IJBOmnichainDeployer {
     /// @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.
@@ -72,8 +74,7 @@ interface IJBOmnichainDeployer {
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
         string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         external
         returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers);
@@ -85,7 +86,6 @@ interface IJBOmnichainDeployer {
     /// @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.
@@ -95,8 +95,7 @@ interface IJBOmnichainDeployer {
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
         string calldata memo,
-        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        IJBController controller
+        JBSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         external
         returns (uint256 projectId, IJB721TiersHook hook, address[] memory suckers);
@@ -108,7 +107,6 @@ interface IJBOmnichainDeployer {
     /// @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(
@@ -117,8 +115,7 @@ interface IJBOmnichainDeployer {
         JBOmnichain721Config memory deploy721Config,
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         external
         returns (uint256 rulesetId, IJB721TiersHook hook);
@@ -129,7 +126,6 @@ interface IJBOmnichainDeployer {
     /// @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(
@@ -137,8 +133,7 @@ interface IJBOmnichainDeployer {
         string calldata projectUri,
         JBRulesetConfig[] memory rulesetConfigurations,
         JBTerminalConfig[] calldata terminalConfigurations,
-        string calldata memo,
-        IJBController controller
+        string calldata memo
     )
         external
         returns (uint256 rulesetId, IJB721TiersHook hook);
@@ -150,15 +145,13 @@ interface IJBOmnichainDeployer {
     /// @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
+        string calldata memo
     )
         external
         returns (uint256 rulesetId, IJB721TiersHook hook);
@@ -167,14 +160,12 @@ interface IJBOmnichainDeployer {
     /// @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
+        string calldata memo
     )
         external
         returns (uint256 rulesetId, IJB721TiersHook hook);

package/CHANGELOG.md

@@ -1,76 +0,0 @@
-# Changelog
-
-## 0.0.43 — Bump v6 deps to nana-core-v6 0.0.53 cohort
-
-- `@bananapus/core-v6`: `^0.0.48 → ^0.0.53` ([PR #145](https://github.com/Bananapus/nana-core-v6/pull/145) — drops `via_ir` requirement on `JBCashOutHookSpecsLib`; new `pauseCrossProjectFeeFreeInflows` ruleset metadata flag for cross-project cashout opt-out).
-- `@bananapus/721-hook-v6`: `^0.0.47 → ^0.0.50`.
-- `@bananapus/suckers-v6`: `^0.0.37 → ^0.0.46`.
-- `@bananapus/buyback-hook-v6`: `^0.0.39 → ^0.0.46`.
-- `@bananapus/permission-ids-v6`: `^0.0.23 → ^0.0.25` (new `SET_SUCKER_PEER` permission referenced by suckers 0.0.46).
-- `JBBuybackHook` constructor signature changed in 0.0.45 (V4 PoolManager + Hooks moved to a one-shot setter). Updated `OmnichainForkTestBase` to construct then call `setChainSpecificConstants`.
-- All `JBRulesetMetadata` test literals patched to include `pauseCrossProjectFeeFreeInflows: false`. `JBBeforeCashOutRecordedContext` literals are unchanged (no new fields).
-
-## v6 carry-forward hook fix
-
-- **Carry-forward hook selection improved.** `queueRulesetsOf` now checks `latestQueuedOf(projectId)` before falling back to `currentOf(projectId)` when carrying forward a 721 hook. Previously it only read `currentOf`, which could miss a recently queued (and approved) ruleset's hook config. The source ruleset must have approval status `Approved` or `Empty` and a stored hook config in the deployer.
-- The `useDataHookForCashOut` flag is preserved from whichever source ruleset is selected during carry-forward.
-
-## Scope
-
-This file describes the verified change from `nana-omnichain-deployers-v5` to the current `nana-omnichain-deployers-v6` repo.
-
-## Current v6 surface
-
-- `JBOmnichainDeployer`
-- `IJBOmnichainDeployer`
-- `JBDeployerHookConfig`
-- `JBOmnichain721Config`
-- `JBTiered721HookConfig`
-
-## Summary
-
-- The deployer now assumes a 721 hook is part of the standard deployment path instead of a special-case path.
-- Hook composition is more explicit. The current repo separates 721-hook behavior from extra data-hook behavior and combines them deliberately.
-- The v6 test suite includes dedicated coverage for ownership transfer, controller validation, empty ruleset edge cases, hook composition, and invariants that were not present in the small v5 tree.
-- The repo moved to the v6 Solidity and dependency baseline.
-
-## Verified deltas
-
-- `launch721ProjectFor(...)`, `launch721RulesetsFor(...)`, and `queue721RulesetsOf(...)` no longer define the public API shape.
-- Their role is covered by overloaded `launchProjectFor(...)`, `launchRulesetsFor(...)`, and `queueRulesetsOf(...)` entry points that accept `JBOmnichain721Config`.
-- `extraDataHookOf(...)` and `tiered721HookOf(...)` replace the older single `dataHookOf(...)` view model.
-- The overloaded launch and queue functions now return the `IJB721TiersHook` they deploy or carry forward.
-
-## Breaking ABI changes
-
-- The 721-specific launch and queue entry points were removed from the public API shape.
-- `dataHookOf(...)` was replaced by `extraDataHookOf(...)` plus `tiered721HookOf(...)`.
-- `launchProjectFor(...)`, `launchRulesetsFor(...)`, and `queueRulesetsOf(...)` now have overloads that return the hook.
-- `JBOmnichain721Config` replaces the old direct 721 deploy config entrypoint model.
-
-## Indexer impact
-
-- Hook composition is now split across two tracked hook sources instead of one.
-- Launch and queue flows should expect a 721 hook in the returned state and in the deployer's stored per-ruleset data.
-
-## Migration notes
-
-- Update any code that expected separate "with 721" and "without 721" deployment paths to behave like v5.
-- Re-check ownership assumptions after hook deployment. The current repo is stricter and more explicit about that flow.
-- If you decode launch or queue inputs, use the current v6 structs instead of v5 layouts.
-
-## ABI appendix
-
-- Removed public API shape
-  - `launch721ProjectFor(...)`
-  - `launch721RulesetsFor(...)`
-  - `queue721RulesetsOf(...)`
-- Replaced with overload families
-  - `launchProjectFor(...)`
-  - `launchRulesetsFor(...)`
-  - `queueRulesetsOf(...)`
-- Replaced hook lookup model
-  - `dataHookOf(...)` -> `extraDataHookOf(...)` + `tiered721HookOf(...)`
-- New migration-sensitive structs
-  - `JBOmnichain721Config`
-  - `JBTiered721HookConfig`