@bananapus/omnichain-deployers-v6 0.0.24 → 0.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bananapus/omnichain-deployers-v6",
-    "version": "0.0.24",
+    "version": "0.0.25",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -17,12 +17,12 @@
         "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.32",
-        "@bananapus/buyback-hook-v6": "^0.0.26",
-        "@bananapus/core-v6": "^0.0.32",
+        "@bananapus/721-hook-v6": "^0.0.33",
+        "@bananapus/buyback-hook-v6": "^0.0.27",
+        "@bananapus/core-v6": "^0.0.34",
         "@bananapus/ownable-v6": "^0.0.17",
-        "@bananapus/permission-ids-v6": "^0.0.15",
-        "@bananapus/suckers-v6": "^0.0.22",
+        "@bananapus/permission-ids-v6": "^0.0.17",
+        "@bananapus/suckers-v6": "^0.0.25",
         "@openzeppelin/contracts": "^5.6.1",
         "@uniswap/v4-core": "^1.0.2"
     },
@@ -30,4 +30,4 @@
         "@bananapus/address-registry-v6": "^0.0.17",
         "@sphinx-labs/plugins": "^0.33.2"
     }
-}
+}

package/src/JBOmnichainDeployer.sol

@@ -133,13 +133,14 @@ contract JBOmnichainDeployer is
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice Allow cash outs from suckers without a tax.
+    /// @notice Allow cash outs from suckers without a tax, and compute cross-chain tax supply for non-sucker cash outs.
     /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a cash out.
     /// @param context Standard Juicebox cash out context. See `JBBeforeCashOutRecordedContext`.
     /// @return cashOutTaxRate The cash out tax rate, which influences the amount of terminal tokens which get cashed
     /// out.
     /// @return cashOutCount The number of project tokens that are cashed out.
-    /// @return totalSupply The total project token supply.
+    /// @return totalSupply The total token supply across all chains (for both proportional reclaim and tax).
+    /// @return effectiveSurplusValue The global surplus across all chains for proportional reclaim.
     /// @return hookSpecifications The amount of funds and the data to send to cash out hooks (this contract).
     function beforeCashOutRecordedWith(JBBeforeCashOutRecordedContext calldata context)
         external
@@ -149,18 +150,28 @@ contract JBOmnichainDeployer is
             uint256 cashOutTaxRate,
             uint256 cashOutCount,
             uint256 totalSupply,
+            uint256 effectiveSurplusValue,
             JBCashOutHookSpecification[] memory hookSpecifications
         )
     {
         // 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.
         if (SUCKER_REGISTRY.isSuckerOf({projectId: context.projectId, addr: context.holder})) {
-            return (0, context.cashOutCount, context.totalSupply, hookSpecifications);
+            return (0, context.cashOutCount, context.totalSupply, context.surplus.value, hookSpecifications);
         }
 
         // Start with the values from the context. Hooks below may override these.
         cashOutTaxRate = context.cashOutTaxRate;
         cashOutCount = context.cashOutCount;
-        totalSupply = context.totalSupply;
+
+        // Compute the cross-chain total supply: local supply + sum of known peer chain supplies.
+        // This prevents the cash out tax from vanishing when a holder dominates the local supply.
+        totalSupply = context.totalSupply + SUCKER_REGISTRY.remoteTotalSupplyOf(context.projectId);
+
+        // 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)));
 
         // Will hold the 721 hook's cash out specifications (always 0 or 1 element).
         JBCashOutHookSpecification[] memory tiered721HookSpecifications;
@@ -170,8 +181,11 @@ contract JBOmnichainDeployer is
 
         // 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) {
-            // Forward to the 721 hook. It may change the tax rate, count, supply, and return hook specs.
-            (cashOutTaxRate, cashOutCount, totalSupply, tiered721HookSpecifications) =
+            // Forward to the 721 hook. It may change the tax rate, count, and return hook specs.
+            // We discard the inner hook's effectiveSurplusValue — this contract computes the cross-chain values.
+            // We also discard its totalSupply since this contract computes the cross-chain supply.
+            // slither-disable-next-line unused-return
+            (cashOutTaxRate, cashOutCount,,, tiered721HookSpecifications) =
                 IJBRulesetDataHook(address(tiered721Config.hook)).beforeCashOutRecordedWith(context);
         }
 
@@ -189,14 +203,17 @@ contract JBOmnichainDeployer is
             hookContext.cashOutCount = cashOutCount;
             hookContext.totalSupply = totalSupply;
 
-            // Forward to the extra hook. It may further change the tax rate, count, supply, and return hook specs.
-            (cashOutTaxRate, cashOutCount, totalSupply, extraHookSpecifications) =
+            // Forward to the extra hook. It may further change the tax rate, count, and return hook specs.
+            // We discard the inner hook's effectiveSurplusValue — this contract computes the cross-chain values.
+            // We also discard its totalSupply since this contract computes the cross-chain supply.
+            // slither-disable-next-line unused-return
+            (cashOutTaxRate, cashOutCount,,, extraHookSpecifications) =
                 extraHook.dataHook.beforeCashOutRecordedWith(hookContext);
         }
 
         // If neither hook returned any specifications, return the adjusted values with no hook specs.
         if (tiered721HookSpecifications.length == 0 && extraHookSpecifications.length == 0) {
-            return (cashOutTaxRate, cashOutCount, totalSupply, hookSpecifications);
+            return (cashOutTaxRate, cashOutCount, totalSupply, effectiveSurplusValue, hookSpecifications);
         }
 
         // Merge both hooks' specifications: 721 spec (if any) first, then extra hook specs.
@@ -215,7 +232,7 @@ contract JBOmnichainDeployer is
             hookSpecifications = extraHookSpecifications;
         }
 
-        return (cashOutTaxRate, cashOutCount, totalSupply, hookSpecifications);
+        return (cashOutTaxRate, cashOutCount, totalSupply, effectiveSurplusValue, hookSpecifications);
     }
 
     /// @notice Forward the call to the original data hook.
@@ -614,6 +631,10 @@ contract JBOmnichainDeployer is
         });
     }
 
+    //*********************************************************************//
+    // -------------------------- internal views ------------------------ //
+    //*********************************************************************//
+
     //*********************************************************************//
     // ------------------------ internal functions ----------------------- //
     //*********************************************************************//

package/test/JBOmnichainDeployer.t.sol

@@ -89,6 +89,18 @@ contract TestJBOmnichainDeployer is Test {
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
             abi.encode(uint256(1000), new JBPayHookSpecification[](0))
         );
+
+        // Default: no remote supply or surplus (non-omnichain project).
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
     }
 
     //*********************************************************************//
@@ -207,7 +219,7 @@ contract TestJBOmnichainDeployer is Test {
 
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, rulesetId, sucker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) =
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) =
             deployer.beforeCashOutRecordedWith(context);
 
         assertEq(cashOutTaxRate, 0, "sucker should get 0 tax");
@@ -223,7 +235,7 @@ contract TestJBOmnichainDeployer is Test {
 
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, rulesetId, randomAddr);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) =
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) =
             deployer.beforeCashOutRecordedWith(context);
 
         assertEq(cashOutTaxRate, context.cashOutTaxRate, "non-sucker should get original tax");

package/test/JBOmnichainDeployerGuard.t.sol

@@ -82,6 +82,18 @@ contract MockSuckerRegistry is IJBSuckerRegistry {
         return new address[](0);
     }
 
+    function remoteTotalSupplyOf(uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
+    function remoteBalanceOf(uint256, uint256, uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
+    function remoteSurplusOf(uint256, uint256, uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
     function removeDeprecatedSucker(uint256, address) external override {}
     function removeSuckerDeployer(address) external override {}
 }

package/test/OmnichainDeployerAttacks.t.sol

@@ -43,7 +43,7 @@ contract RevertingDataHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
         revert("Hook always reverts");
     }
@@ -72,9 +72,11 @@ contract InflatingDataHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
-        return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, new JBCashOutHookSpecification[](0));
+        return (
+            context.cashOutTaxRate, context.cashOutCount, context.totalSupply, 0, new JBCashOutHookSpecification[](0)
+        );
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -142,6 +144,18 @@ contract OmnichainDeployerAttacks is Test {
             abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
             abi.encode(uint256(1000), new JBPayHookSpecification[](0))
         );
+
+        // Default: no remote supply or surplus (non-omnichain project).
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
     }
 
     // =========================================================================
@@ -166,7 +180,7 @@ contract OmnichainDeployerAttacks is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, sucker);
 
-        (uint256 cashOutTaxRate,,,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate,,,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 0, "Sucker should get 0 tax");
     }
 
@@ -182,7 +196,7 @@ contract OmnichainDeployerAttacks is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
-        (uint256 cashOutTaxRate,,,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate,,,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 5000, "Non-sucker should get original tax");
     }
 
@@ -291,7 +305,7 @@ contract OmnichainDeployerAttacks is Test {
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, storedRulesetId, sucker);
 
         // Sucker gets early return with 0 tax — never hits the reverting hook.
-        (uint256 cashOutTaxRate,,,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate,,,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 0, "Sucker bypasses hook and gets 0 tax");
     }
 

package/test/OmnichainDeployerEdgeCases.t.sol

@@ -78,7 +78,7 @@ contract CustomCashOutHook is IJBRulesetDataHook {
         external
         view
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
         JBCashOutHookSpecification[] memory hookSpecifications;
 
@@ -92,7 +92,7 @@ contract CustomCashOutHook is IJBRulesetDataHook {
             });
         }
 
-        return (cashOutTaxRateReturn, cashOutCountReturn, totalSupplyReturn, hookSpecifications);
+        return (cashOutTaxRateReturn, cashOutCountReturn, totalSupplyReturn, 0, hookSpecifications);
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external view override returns (bool) {
@@ -145,6 +145,18 @@ contract OmnichainDeployerEdgeCases is Test {
             address(suckerRegistry), abi.encodeWithSelector(IJBSuckerRegistry.isSuckerOf.selector), abi.encode(false)
         );
 
+        // Default: no remote supply or surplus (non-omnichain project).
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
+
         // Hook deployer mocks (every path now deploys a 721 hook).
         vm.mockCall(
             address(hookDeployer),
@@ -324,7 +336,7 @@ contract OmnichainDeployerEdgeCases is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 5000, "Should return original tax rate");
         assertEq(cashOutCount, 1000, "Should return original cashOutCount");
         assertEq(totalSupply, 10_000, "Should return original totalSupply");
@@ -341,10 +353,12 @@ contract OmnichainDeployerEdgeCases is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 2000, "Should return custom hook tax rate");
         assertEq(cashOutCount, 500, "Should return custom hook cashOutCount");
-        assertEq(totalSupply, 8000, "Should return custom hook totalSupply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, ctx.totalSupply, "Should return cross-chain totalSupply (context value with no suckers)");
     }
 
     // =========================================================================
@@ -370,7 +384,7 @@ contract OmnichainDeployerEdgeCases is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, sucker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 0, "Sucker should get 0 tax regardless of hooks");
         assertEq(cashOutCount, 1000, "Sucker should get original cashOutCount");
         assertEq(totalSupply, 10_000, "Sucker should get original totalSupply");
@@ -391,14 +405,14 @@ contract OmnichainDeployerEdgeCases is Test {
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforeCashOutRecordedWith.selector),
-            abi.encode(uint256(9999), uint256(1), uint256(1), new JBCashOutHookSpecification[](0))
+            abi.encode(uint256(9999), uint256(1), uint256(1), uint256(0), new JBCashOutHookSpecification[](0))
         );
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
         // Since useDataHookForCashOut is false, the 721 hook should NOT be called.
         // Original values should be returned.
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 5000, "Should return original tax rate, not 721 hook's 9999");
         assertEq(cashOutCount, 1000, "Should return original cashOutCount, not 721 hook's 1");
         assertEq(totalSupply, 10_000, "Should return original totalSupply, not 721 hook's 1");
@@ -417,10 +431,12 @@ contract OmnichainDeployerEdgeCases is Test {
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
         // Since useDataHookForCashOut is true, the custom hook SHOULD be called.
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 9999, "Should return custom hook's tax rate");
         assertEq(cashOutCount, 1, "Should return custom hook's cashOutCount");
-        assertEq(totalSupply, 1, "Should return custom hook's totalSupply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, ctx.totalSupply, "Should return cross-chain totalSupply (context value with no suckers)");
     }
 
     function test_beforeCashOut_merges721AndCustomHookSpecifications() public {
@@ -441,7 +457,7 @@ contract OmnichainDeployerEdgeCases is Test {
         vm.mockCall(
             mock721,
             abi.encodeWithSelector(IJBRulesetDataHook.beforeCashOutRecordedWith.selector),
-            abi.encode(uint256(4000), uint256(700), uint256(9000), specs)
+            abi.encode(uint256(4000), uint256(700), uint256(9000), uint256(0), specs)
         );
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
@@ -449,13 +465,15 @@ contract OmnichainDeployerEdgeCases is Test {
         (
             uint256 cashOutTaxRate,
             uint256 cashOutCount,
-            uint256 totalSupply,
+            uint256 totalSupply,,
             JBCashOutHookSpecification[] memory hookSpecifications
         ) = deployer.beforeCashOutRecordedWith(ctx);
 
         assertEq(cashOutTaxRate, 2000, "Custom hook should receive and override 721-adjusted tax rate");
         assertEq(cashOutCount, 500, "Custom hook should receive and override 721-adjusted cashOutCount");
-        assertEq(totalSupply, 8000, "Custom hook should receive and override 721-adjusted totalSupply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, ctx.totalSupply, "Should return cross-chain totalSupply (context value with no suckers)");
         assertEq(hookSpecifications.length, 2, "721 and custom cash out specs should both be returned");
         assertEq(address(hookSpecifications[0].hook), mock721, "721 hook spec should come first");
         assertEq(hookSpecifications[0].amount, 11, "721 hook spec amount should be preserved");
@@ -477,7 +495,7 @@ contract OmnichainDeployerEdgeCases is Test {
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
         // Since useDataHookForCashOut is false, the custom hook should NOT be called.
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 5000, "Should return original tax rate, not custom hook's 2000");
         assertEq(cashOutCount, 1000, "Should return original cashOutCount, not custom hook's 1");
         assertEq(totalSupply, 10_000, "Should return original totalSupply, not custom hook's 1");
@@ -494,7 +512,7 @@ contract OmnichainDeployerEdgeCases is Test {
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, rulesetId, attacker);
 
         // No 721 hook, no custom hook — should fall through to original values.
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 5000, "Should return original tax rate");
         assertEq(cashOutCount, 1000, "Should return original cashOutCount");
         assertEq(totalSupply, 10_000, "Should return original totalSupply");

package/test/TestAuditGaps.sol

@@ -55,9 +55,11 @@ contract PayRevertingHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
-        return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, new JBCashOutHookSpecification[](0));
+        return (
+            context.cashOutTaxRate, context.cashOutCount, context.totalSupply, 0, new JBCashOutHookSpecification[](0)
+        );
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -86,7 +88,7 @@ contract CashOutRevertingHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
         revert CustomCashOutError();
     }
@@ -117,9 +119,11 @@ contract MintPermissionRevertingHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
-        return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, new JBCashOutHookSpecification[](0));
+        return (
+            context.cashOutTaxRate, context.cashOutCount, context.totalSupply, 0, new JBCashOutHookSpecification[](0)
+        );
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -146,10 +150,10 @@ contract ExtremeCashOutHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
         // Return extreme values: max tax rate, zero count, max supply.
-        return (type(uint256).max, 0, type(uint256).max, new JBCashOutHookSpecification[](0));
+        return (type(uint256).max, 0, type(uint256).max, 0, new JBCashOutHookSpecification[](0));
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -189,9 +193,11 @@ contract ManySpecsHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
-        return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, new JBCashOutHookSpecification[](0));
+        return (
+            context.cashOutTaxRate, context.cashOutCount, context.totalSupply, 0, new JBCashOutHookSpecification[](0)
+        );
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -219,9 +225,11 @@ contract ZeroWeightHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
-        return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, new JBCashOutHookSpecification[](0));
+        return (
+            context.cashOutTaxRate, context.cashOutCount, context.totalSupply, 0, new JBCashOutHookSpecification[](0)
+        );
     }
 
     function hasMintPermissionFor(uint256, JBRuleset calldata, address) external pure override returns (bool) {
@@ -310,6 +318,18 @@ contract TestAuditGaps is Test {
             address(suckerRegistry), abi.encodeWithSelector(IJBSuckerRegistry.isSuckerOf.selector), abi.encode(false)
         );
 
+        // Default: no remote supply or surplus (non-omnichain project).
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
+
         // Default 721 hook mock: returns context weight and empty specs (0 tiers, no splits).
         // A real 721 hook with no tiers returns contextWeight unchanged.
         vm.mockCall(
@@ -369,7 +389,7 @@ contract TestAuditGaps is Test {
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, storedRulesetId, sucker);
 
         // Sucker gets early return -- never hits the reverting hook.
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, 0, "Sucker should get 0 tax even with reverting hook");
         assertEq(cashOutCount, ctx.cashOutCount, "Sucker cashOutCount should pass through");
         assertEq(totalSupply, ctx.totalSupply, "Sucker totalSupply should pass through");
@@ -427,10 +447,12 @@ contract TestAuditGaps is Test {
 
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, storedRulesetId, attacker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, type(uint256).max, "Should pass through max tax rate from hook");
         assertEq(cashOutCount, 0, "Should pass through 0 count from hook");
-        assertEq(totalSupply, type(uint256).max, "Should pass through max supply from hook");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, ctx.totalSupply, "Should return cross-chain totalSupply (context value with no suckers)");
     }
 
     // -------------------------------------------------------------------------
@@ -482,7 +504,7 @@ contract TestAuditGaps is Test {
         // Cash out should work since the hook only reverts for pay (useDataHookForCashOut = false).
         JBBeforeCashOutRecordedContext memory ctx = _makeCashOutContext(projectId, storedRulesetId, attacker);
 
-        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(ctx);
+        (uint256 cashOutTaxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(ctx);
         assertEq(cashOutTaxRate, ctx.cashOutTaxRate, "Cash out should return original tax rate");
         assertEq(cashOutCount, ctx.cashOutCount, "Cash out should return original count");
         assertEq(totalSupply, ctx.totalSupply, "Cash out should return original supply");

package/test/Tiered721HookComposition.t.sol

@@ -106,6 +106,16 @@ contract Tiered721HookComposition is Test {
         vm.mockCall(
             address(suckerRegistry), abi.encodeWithSelector(IJBSuckerRegistry.isSuckerOf.selector), abi.encode(false)
         );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
         JBPayHookSpecification[] memory default721Specs = new JBPayHookSpecification[](1);
         default721Specs[0] =
             JBPayHookSpecification({hook: IJBPayHook(hookAddr), noop: false, amount: 0, metadata: bytes("")});
@@ -330,7 +340,7 @@ contract Tiered721HookComposition is Test {
             abi.encode(true)
         );
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, block.timestamp, sucker);
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
         assertEq(taxRate, 0, "sucker gets 0 tax");
         assertEq(cashOutCount, context.cashOutCount);
         assertEq(totalSupply, context.totalSupply);
@@ -349,13 +359,15 @@ contract Tiered721HookComposition is Test {
         vm.mockCall(
             buybackHookAddr,
             abi.encodeWithSelector(IJBRulesetDataHook.beforeCashOutRecordedWith.selector),
-            abi.encode(uint256(3000), uint256(500), uint256(5000), cashOutSpecs)
+            abi.encode(uint256(3000), uint256(500), uint256(5000), uint256(0), cashOutSpecs)
         );
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, block.timestamp, randomAddr);
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
         assertEq(taxRate, 3000, "buyback hook's tax rate");
         assertEq(cashOutCount, 500, "buyback hook's cashOutCount");
-        assertEq(totalSupply, 5000, "buyback hook's totalSupply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, context.totalSupply, "cross-chain totalSupply (context value with no suckers)");
     }
 
     function test_beforeCashOut_zeroTiers_forwardsToUserHook() public {
@@ -375,13 +387,15 @@ contract Tiered721HookComposition is Test {
         vm.mockCall(
             customHookAddr,
             abi.encodeWithSelector(IJBRulesetDataHook.beforeCashOutRecordedWith.selector),
-            abi.encode(uint256(2000), uint256(100), uint256(1000), cashOutSpecs)
+            abi.encode(uint256(2000), uint256(100), uint256(1000), uint256(0), cashOutSpecs)
         );
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, block.timestamp, randomAddr);
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
         assertEq(taxRate, 2000, "user hook's tax rate");
         assertEq(cashOutCount, 100, "user hook's cashOutCount");
-        assertEq(totalSupply, 1000, "user hook's totalSupply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply.
+        assertEq(totalSupply, context.totalSupply, "cross-chain totalSupply (context value with no suckers)");
     }
 
     function test_beforeCashOut_zeroTiers_noUserHook_returnsOriginal() public {
@@ -398,7 +412,7 @@ contract Tiered721HookComposition is Test {
             controller
         );
         JBBeforeCashOutRecordedContext memory context = _makeCashOutContext(projectId, block.timestamp, randomAddr);
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
         assertEq(taxRate, context.cashOutTaxRate, "original tax rate");
         assertEq(cashOutCount, context.cashOutCount);
         assertEq(totalSupply, context.totalSupply);

package/test/audit/CarryForwardRejectedHook.t.sol

@@ -126,6 +126,18 @@ contract MockSuckerRegistryCarryForward is IJBSuckerRegistry {
         return new address[](0);
     }
 
+    function remoteTotalSupplyOf(uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
+    function remoteBalanceOf(uint256, uint256, uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
+    function remoteSurplusOf(uint256, uint256, uint256) external pure override returns (uint256) {
+        return 0;
+    }
+
     function removeDeprecatedSucker(uint256, address) external override {}
     function removeSuckerDeployer(address) external override {}
 }

package/test/audit/CodexNemesisAudit.t.sol

@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import {Test} from "forge-std/Test.sol";
+
+import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
+import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
+import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
+import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookProjectDeployer.sol";
+import {IJBOwnable} from "@bananapus/ownable-v6/src/interfaces/IJBOwnable.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {JBSuckerRegistry} from "@bananapus/suckers-v6/src/JBSuckerRegistry.sol";
+import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerRegistry.sol";
+import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+
+import {JBOmnichainDeployer} from "../../src/JBOmnichainDeployer.sol";
+import {JBOmnichain721Config} from "../../src/structs/JBOmnichain721Config.sol";
+import {JBSuckerDeploymentConfig} from "../../src/structs/JBSuckerDeploymentConfig.sol";
+
+contract CodexNemesisAudit is Test {
+    IJBPermissions internal permissions = IJBPermissions(makeAddr("permissions"));
+    IJBProjects internal projects = IJBProjects(makeAddr("projects"));
+    IJB721TiersHookDeployer internal hookDeployer = IJB721TiersHookDeployer(makeAddr("hookDeployer"));
+    IJBSuckerRegistry internal mockSuckerRegistry = IJBSuckerRegistry(makeAddr("suckerRegistry"));
+    IJBController internal controller = IJBController(makeAddr("controller"));
+    IJBDirectory internal directory = IJBDirectory(makeAddr("directory"));
+    address internal hookAddr = makeAddr("hook721");
+    address internal projectOwner = makeAddr("projectOwner");
+    address internal operator = makeAddr("operator");
+
+    uint256 internal constant PROJECT_ID = 42;
+
+    function setUp() public {
+        vm.mockCall(
+            address(permissions), abi.encodeWithSelector(IJBPermissions.setPermissionsFor.selector), abi.encode()
+        );
+        vm.mockCall(
+            address(permissions), abi.encodeWithSelector(IJBPermissions.hasPermission.selector), abi.encode(true)
+        );
+        vm.mockCall(
+            address(projects), abi.encodeWithSelector(IERC721.ownerOf.selector, PROJECT_ID), abi.encode(projectOwner)
+        );
+        vm.mockCall(
+            address(hookDeployer),
+            abi.encodeWithSelector(IJB721TiersHookDeployer.deployHookFor.selector),
+            abi.encode(IJB721TiersHook(hookAddr))
+        );
+        vm.mockCall(hookAddr, abi.encodeWithSelector(IJBOwnable.transferOwnershipToProject.selector), abi.encode());
+    }
+
+    function test_poc_launchRulesetsFor_revertsWhenProjectHasNoControllerYet() public {
+        JBOmnichainDeployer deployer =
+            new JBOmnichainDeployer(mockSuckerRegistry, hookDeployer, permissions, projects, address(0));
+
+        vm.mockCall(
+            address(controller), abi.encodeWithSelector(IJBController.DIRECTORY.selector), abi.encode(directory)
+        );
+        // A freshly created project with no controller yet is valid for core launchRulesetsFor,
+        // but the deployer rejects it before the controller can set itself as first controller.
+        vm.mockCall(
+            address(directory),
+            abi.encodeWithSelector(IJBDirectory.controllerOf.selector, PROJECT_ID),
+            abi.encode(IERC165(address(0)))
+        );
+
+        JBRulesetConfig[] memory configs = new JBRulesetConfig[](1);
+        configs[0] = _makeRulesetConfig();
+
+        vm.prank(projectOwner);
+        vm.expectRevert(JBOmnichainDeployer.JBOmnichainDeployer_ControllerMismatch.selector);
+        deployer.launchRulesetsFor(PROJECT_ID, configs, new JBTerminalConfig[](0), "memo", controller);
+    }
+
+    function test_poc_deploySuckersFor_requiresHiddenPermissionForDeployerItself() public {
+        vm.mockCall(address(directory), abi.encodeWithSelector(IJBDirectory.PROJECTS.selector), abi.encode(projects));
+
+        JBSuckerRegistry registry = new JBSuckerRegistry(directory, permissions, address(this), address(0));
+        JBOmnichainDeployer deployer = new JBOmnichainDeployer(
+            IJBSuckerRegistry(address(registry)), hookDeployer, permissions, projects, address(0)
+        );
+
+        vm.mockCall(
+            address(permissions),
+            abi.encodeWithSelector(
+                IJBPermissions.hasPermission.selector,
+                operator,
+                projectOwner,
+                PROJECT_ID,
+                JBPermissionIds.DEPLOY_SUCKERS,
+                true,
+                true
+            ),
+            abi.encode(true)
+        );
+        vm.mockCall(
+            address(permissions),
+            abi.encodeWithSelector(
+                IJBPermissions.hasPermission.selector,
+                address(deployer),
+                projectOwner,
+                PROJECT_ID,
+                JBPermissionIds.DEPLOY_SUCKERS,
+                true,
+                true
+            ),
+            abi.encode(false)
+        );
+
+        JBSuckerDeploymentConfig memory config = JBSuckerDeploymentConfig({
+            deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: bytes32("SUCKER_SALT")
+        });
+
+        vm.prank(operator);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBPermissioned.JBPermissioned_Unauthorized.selector,
+                projectOwner,
+                address(deployer),
+                PROJECT_ID,
+                JBPermissionIds.DEPLOY_SUCKERS
+            )
+        );
+        deployer.deploySuckersFor(PROJECT_ID, config);
+    }
+
+    function _makeRulesetConfig() internal pure returns (JBRulesetConfig memory config) {
+        config.metadata = JBRulesetMetadata({
+            reservedPercent: 0,
+            cashOutTaxRate: 0,
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            pausePay: false,
+            pauseCreditTransfers: false,
+            allowOwnerMinting: false,
+            allowSetCustomToken: false,
+            allowTerminalMigration: false,
+            allowSetTerminals: false,
+            allowSetController: false,
+            allowAddAccountingContext: false,
+            allowAddPriceFeed: false,
+            ownerMustSendPayouts: false,
+            holdFees: false,
+            useTotalSurplusForCashOuts: false,
+            useDataHookForPay: false,
+            useDataHookForCashOut: false,
+            dataHook: address(0),
+            metadata: 0
+        });
+    }
+}

package/test/audit/JBOmnichainDeployer.t.sol

@@ -145,6 +145,14 @@ contract JBOmnichainDeployerTest is Test {
             abi.encode()
         );
         vm.mockCall(suckerRegistry, abi.encodeWithSelector(IJBSuckerRegistry.isSuckerOf.selector), abi.encode(false));
+        vm.mockCall(
+            suckerRegistry,
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            suckerRegistry, abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector), abi.encode(uint256(0))
+        );
 
         JBOmnichainDeployer deployer =
             new JBOmnichainDeployer(IJBSuckerRegistry(suckerRegistry), hookDeployer, permissions, projects, address(0));
@@ -153,7 +161,7 @@ contract JBOmnichainDeployerTest is Test {
         vm.mockCall(
             hookAddr,
             abi.encodeWithSelector(IJBRulesetDataHook.beforeCashOutRecordedWith.selector),
-            abi.encode(uint256(1234), uint256(55), uint256(999), emptySpecs)
+            abi.encode(uint256(1234), uint256(55), uint256(999), uint256(0), emptySpecs)
         );
 
         JBRulesetConfig[] memory launchConfigs = new JBRulesetConfig[](1);
@@ -177,11 +185,13 @@ contract JBOmnichainDeployerTest is Test {
         assertTrue(initialUseForCashOut, "launch should store the initial cash-out flag");
 
         JBBeforeCashOutRecordedContext memory initialContext = _cashOutContext(initialRulesetId);
-        (uint256 initialTaxRate, uint256 initialCashOutCount, uint256 initialTotalSupply,) =
+        (uint256 initialTaxRate, uint256 initialCashOutCount, uint256 initialTotalSupply,,) =
             deployer.beforeCashOutRecordedWith(initialContext);
         assertEq(initialTaxRate, 1234, "initial ruleset should forward cash-outs into the 721 hook");
         assertEq(initialCashOutCount, 55, "initial ruleset should use the 721 hook cash-out count");
-        assertEq(initialTotalSupply, 999, "initial ruleset should use the 721 hook total supply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply (777).
+        assertEq(initialTotalSupply, 777, "initial ruleset should use cross-chain totalSupply (context value)");
 
         vm.mockCall(
             address(controller), abi.encodeWithSelector(IJBController.DIRECTORY.selector), abi.encode(directory)
@@ -239,13 +249,15 @@ contract JBOmnichainDeployerTest is Test {
         assertTrue(queuedUseForCashOut, "queue should preserve the existing 721 cash-out flag");
 
         JBBeforeCashOutRecordedContext memory queuedContext = _cashOutContext(queuedRulesetId);
-        (uint256 queuedTaxRate, uint256 queuedCashOutCount, uint256 queuedTotalSupply,) =
+        (uint256 queuedTaxRate, uint256 queuedCashOutCount, uint256 queuedTotalSupply,,) =
             deployer.beforeCashOutRecordedWith(queuedContext);
 
         // The 721 hook is properly consulted for cash-outs in the queued ruleset.
         assertEq(queuedTaxRate, 1234, "queued ruleset should forward cash-outs into the 721 hook");
         assertEq(queuedCashOutCount, 55, "queued ruleset should use the 721 hook cash-out count");
-        assertEq(queuedTotalSupply, 999, "queued ruleset should use the 721 hook total supply");
+        // The deployer discards the inner hook's totalSupply and computes cross-chain supply instead.
+        // With no suckers, this equals context.totalSupply (777).
+        assertEq(queuedTotalSupply, 777, "queued ruleset should use cross-chain totalSupply (context value)");
     }
 
     function _cashOutContext(uint256 rulesetId) internal pure returns (JBBeforeCashOutRecordedContext memory context) {

package/test/audit/WeightScalingComparison.t.sol

@@ -70,6 +70,18 @@ contract WeightScalingComparisonTest is Test {
             address(suckerRegistry), abi.encodeWithSelector(IJBSuckerRegistry.isSuckerOf.selector), abi.encode(false)
         );
 
+        // Default: no remote supply or surplus (non-omnichain project).
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteTotalSupplyOf.selector),
+            abi.encode(uint256(0))
+        );
+        vm.mockCall(
+            address(suckerRegistry),
+            abi.encodeWithSelector(IJBSuckerRegistry.remoteSurplusOf.selector),
+            abi.encode(uint256(0))
+        );
+
         // Mock hook deployer to return our mock hook address.
         vm.mockCall(
             address(hookDeployer),

package/test/fork/OmnichainForkTestBase.sol

@@ -27,6 +27,7 @@ import {JBSuckerRegistry} from "@bananapus/suckers-v6/src/JBSuckerRegistry.sol";
 import {JB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
 import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+import {JB721CheckpointsDeployer} from "@bananapus/721-hook-v6/src/JB721CheckpointsDeployer.sol";
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookProjectDeployer.sol";
 import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
@@ -181,7 +182,14 @@ abstract contract OmnichainForkTestBase is TestBaseWorkflow {
         suckerRegistry = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         hookStore = new JB721TiersHookStore();
         exampleHook = new JB721TiersHook(
-            jbDirectory(), jbPermissions(), jbPrices(), jbRulesets(), hookStore, jbSplits(), address(0)
+            jbDirectory(),
+            jbPermissions(),
+            jbPrices(),
+            jbRulesets(),
+            hookStore,
+            jbSplits(),
+            new JB721CheckpointsDeployer(),
+            address(0)
         );
         addressRegistry = new JBAddressRegistry();
         hookDeployer721 = new JB721TiersHookDeployer(exampleHook, hookStore, addressRegistry, multisig());

package/test/fork/TestSuckerDeploymentFork.t.sol

@@ -179,7 +179,7 @@ contract TestSuckerDeploymentFork is OmnichainForkTestBase {
         });
 
         // Call beforeCashOutRecordedWith directly on the omnichain deployer.
-        (uint256 returnedTaxRate, uint256 returnedCashOutCount, uint256 returnedTotalSupply,) =
+        (uint256 returnedTaxRate, uint256 returnedCashOutCount, uint256 returnedTotalSupply,,) =
             omnichainDeployer.beforeCashOutRecordedWith(context);
 
         // Sucker should get 0% tax.