@bananapus/core-v6 0.0.15 → 0.0.17

package/test/units/static/JBPrices/TestPricePerUnitOf.sol

@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBPriceFeed} from "../../../../src/interfaces/IJBPriceFeed.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBPricesSetup} from "./JBPricesSetup.sol";
 
 contract TestPricePerUnitOf_Local is JBPricesSetup {
     IJBPriceFeed _feed = IJBPriceFeed(makeAddr("priceFeed"));
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 DEFAULT_PROJECT_ID = 0;
     uint256 _projectId = 1;
     uint256 _defaultDirectPrice = 1_000_000_000;

package/test/units/static/JBPrices/TestPrices.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBPrices} from "../../../../src/JBPrices.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBPricesSetup} from "./JBPricesSetup.sol";
 import {MockPriceFeed} from "../../../mock/MockPriceFeed.sol";
 

package/test/units/static/JBProjects/JBProjectsSetup.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBProjects} from "../../../../src/JBProjects.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBProjects/TestCreateFor.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {stdError} from "forge-std/StdError.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 

package/test/units/static/JBProjects/TestInitialProject.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBProjects} from "../../../../src/JBProjects.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 contract TestInitialProject_Local is JBTest {

package/test/units/static/JBProjects/TestInterfaces.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestSupportsInterface_Local is JBProjectsSetup {

package/test/units/static/JBProjects/TestSetResolver.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
+import {IJBTokenUriResolver} from "../../../../src/interfaces/IJBTokenUriResolver.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestSetTokenURIResolver_Local is JBProjectsSetup {

package/test/units/static/JBProjects/TestTokenUri.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {StdStorage, stdStorage} from "forge-std/StdStorage.sol";
+import {IJBTokenUriResolver} from "../../../../src/interfaces/IJBTokenUriResolver.sol";
+import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import {JBProjectsSetup} from "./JBProjectsSetup.sol";
 
 contract TestTokenURI_Local is JBProjectsSetup {

package/test/units/static/JBRulesetMetadataResolver/TestSetCashOutTaxRateTo.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 contract TestSetCashOutTaxRateTo_Local is JBTest {
@@ -50,24 +53,29 @@ contract TestSetCashOutTaxRateTo_Local is JBTest {
         uint256 _packed = _rulesMetadata.packRulesetMetadata();
 
         // Reserved Rate
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _reservedPercent = uint256(uint16(_packed >> 4));
 
         // Cash out tax rate
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _cashOutTaxRate = uint256(uint16(_packed >> 20));
 
         assertEq(_reservedPercent, _fuzzReservedPercent);
         assertEq(_cashOutTaxRate, _fuzzCashOutTaxRate);
 
         for (uint256 _i = 68; _i < 81; _i++) {
+            // forge-lint: disable-next-line(unsafe-typecast)
             uint256 _flag = uint256(uint16(_packed >> _i) & 1);
             assertEq(_flag, 1);
         }
 
         // Data source address
+        // forge-lint: disable-next-line(unsafe-typecast)
         address _packedDataHook = address(uint160(_packed >> 82));
         assertEq(_packedDataHook, _hookAddress);
 
         // Metadata
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 _packedMetadata = uint256(uint16(_packed >> 242));
         assertEq(_packedMetadata, uint256(_fuzzMetadata));
     }

package/test/units/static/JBRulesets/JBRulesetsSetup.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBRulesets} from "../../../../src/JBRulesets.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBRulesets/TestCurrentApprovalStatusForLatestRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestCurrentApprovalStatusForLatestRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestCurrentOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestCurrentOf_Local is JBRulesetsSetup {
@@ -79,6 +87,7 @@ contract TestCurrentOf_Local is JBRulesetsSetup {
         assertEq(_ruleset.id, 0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     modifier whenLatestRulesetIdDNEQZero() {
         // put code at hook address
         vm.etch(address(_mockApprovalHook), abi.encode(1));

package/test/units/static/JBRulesets/TestGetRulesetOf.sol

@@ -1,7 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestGetRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestLatestQueuedRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestLatestQueuedRulesetOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestRulesets.sol

@@ -1,7 +1,18 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {stdError} from "forge-std/StdError.sol";
+import {JBRulesets} from "../../../../src/JBRulesets.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 contract TestJBRulesetsUnits_Local is JBTest {

package/test/units/static/JBRulesets/TestRulesetsOf.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestRulesetsOf_Local is JBRulesetsSetup {

package/test/units/static/JBRulesets/TestUpcomingRulesetOf.sol

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBApprovalStatus} from "../../../../src/enums/JBApprovalStatus.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestUpcomingOf_Local is JBRulesetsSetup {
@@ -79,6 +87,7 @@ contract TestUpcomingOf_Local is JBRulesetsSetup {
         assertEq(_upcoming.id, 0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     modifier whenUpcomingRulesetIdDNEQZero() {
         // put code at hook address
         vm.etch(address(_mockApprovalHook), abi.encode(1));

package/test/units/static/JBRulesets/TestUpdateRulesetWeightCache.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBRulesetsSetup} from "./JBRulesetsSetup.sol";
 
 contract TestUpdateRulesetWeightCache_Local is JBRulesetsSetup {

package/test/units/static/JBSplits/JBSplitsSetup.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBSplits/TestSelfManagedSplitGroups.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {JBControlled} from "../../../../src/abstract/JBControlled.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
@@ -50,9 +57,9 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     // ──────────────────
 
     function test_CallerCanSetSplitsInOwnGroupNamespace() external {
-        // Any contract can set splits when groupId's lower 160 bits == msg.sender.
+        // Self-auth requires non-zero upper 96 bits + lower 160 bits == msg.sender.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT / 2, _bene);
 
@@ -114,7 +121,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_CallerCanSetMultipleSplitsInOwnGroup() external {
         // Multiple splits in the same self-managed group.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         address payable bene1 = payable(makeAddr("bene1"));
         address payable bene2 = payable(makeAddr("bene2"));
@@ -151,7 +158,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_CallerCanOverwriteOwnSplits() external {
         // Caller can overwrite their own splits.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         address payable beneOld = payable(makeAddr("beneOld"));
         address payable beneNew = payable(makeAddr("beneNew"));
@@ -176,7 +183,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsEmitSetSplitEvent() external {
         // Setting self-managed splits emits SetSplit with correct caller.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
 
@@ -190,7 +197,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsWorkAcrossRulesets() external {
         // Caller can set splits in the same group but different rulesets.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         uint256 rulesetA = 100;
         uint256 rulesetB = 200;
@@ -220,7 +227,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
 
     function test_SelfManagedSplitsRevertOnZeroPercent() external {
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
         JBSplit[] memory splits = new JBSplit[](1);
@@ -241,7 +248,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
 
     function test_SelfManagedSplitsRevertOnExcessPercent() external {
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
         JBSplit[] memory splits = new JBSplit[](2);
@@ -271,7 +278,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_SelfManagedSplitsEnforceLocks() external {
         // Locked splits in a self-managed group cannot be removed.
         address caller = makeAddr("hookContract");
-        uint256 groupId = uint256(uint160(caller));
+        uint256 groupId = (1 << 160) | uint256(uint160(caller));
 
         // Set a locked split.
         JBSplitGroup[] memory groups = new JBSplitGroup[](1);
@@ -350,6 +357,46 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
         _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
     }
 
+    // ──────────────── Bare-address groupIds require controller auth
+    // ───────────────
+
+    function test_BareAddressGroupIdRequiresControllerEvenForMatchingSender() external {
+        // A contract cannot self-auth for groupId == uint256(uint160(self)) (upper 96 bits = 0).
+        // This prevents token contracts from hijacking terminal payout splits.
+        address caller = makeAddr("maliciousToken");
+        uint256 groupId = uint256(uint160(caller)); // bare address, upper bits = 0
+
+        JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
+
+        _mockController(makeAddr("realController"));
+
+        vm.prank(caller);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBControlled.JBControlled_ControllerUnauthorized.selector, makeAddr("realController")
+            )
+        );
+        _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
+    }
+
+    function test_BareAddressGroupIdSucceedsWithControllerAuth() external {
+        // The controller CAN still set splits for bare-address groupIds (terminal payout groups).
+        address controller = makeAddr("controller");
+        address token = makeAddr("someToken");
+        uint256 groupId = uint256(uint160(token));
+
+        JBSplitGroup[] memory groups = _makeSplitGroup(groupId, JBConstants.SPLITS_TOTAL_PERCENT, _bene);
+
+        _mockController(controller);
+
+        vm.prank(controller);
+        _splits.setSplitGroupsOf(_projectId, _rulesetId, groups);
+
+        JBSplit[] memory result = _splits.splitsOf(_projectId, _rulesetId, groupId);
+        assertEq(result.length, 1);
+        assertEq(result[0].beneficiary, _bene);
+    }
+
     // ───────────────────── Controller can still set any group
     // ──────────────────
 
@@ -375,9 +422,10 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     // ─────────────────────────────
 
     function test_MixedSelfManagedAndControllerGroupsInOneCall() external {
-        // A single setSplitGroupsOf call with one self-managed group and one controller-gated group.
+        // A single setSplitGroupsOf call with one self-managed group (non-zero upper bits) and one controller-gated
+        // group.
         address caller = makeAddr("hookContract");
-        uint256 selfGroupId = uint256(uint160(caller));
+        uint256 selfGroupId = (1 << 160) | uint256(uint160(caller));
         uint256 otherGroupId = 0;
 
         // Mock: caller IS the controller.
@@ -420,7 +468,7 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function test_MixedCallRevertsIfNonControllerSetsOtherGroup() external {
         // A call with one self-managed group (ok) and one non-owned group (reverts) in the same call.
         address caller = makeAddr("hookContract");
-        uint256 selfGroupId = uint256(uint160(caller));
+        uint256 selfGroupId = (1 << 160) | uint256(uint160(caller));
         uint256 otherGroupId = 0;
 
         _mockController(makeAddr("realController"));
@@ -465,6 +513,8 @@ contract TestSelfManagedSplitGroups_Local is JBSplitsSetup {
     function testFuzz_AnyAddressCanSetOwnNamespace(address caller, uint96 upperBits, uint32 percent) external {
         vm.assume(caller != address(0));
         vm.assume(percent > 0 && percent <= JBConstants.SPLITS_TOTAL_PERCENT);
+        // Self-auth requires non-zero upper bits.
+        vm.assume(upperBits > 0);
 
         uint256 groupId = (uint256(upperBits) << 160) | uint256(uint160(caller));
 

package/test/units/static/JBSplits/TestSetSplitGroupsOf.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {JBControlled} from "../../../../src/abstract/JBControlled.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSetSplitGroupsOf_Local is JBSplitsSetup {

package/test/units/static/JBSplits/TestSplitsLockedEdge.sol

@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplits} from "../../../../src/JBSplits.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitGroup} from "../../../../src/structs/JBSplitGroup.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 /// @notice Edge case tests for JBSplits lock enforcement.

package/test/units/static/JBSplits/TestSplitsOf.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
 import {JBSplitsSetup} from "./JBSplitsSetup.sol";
 
 contract TestSplitsOf_Local is JBSplitsSetup {

package/test/units/static/JBSplits/TestSplitsPacking.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "src/JBSplits.sol";
-import "forge-std/Test.sol";
+import {JBSplits} from "src/JBSplits.sol";
+import {IJBDirectory} from "src/interfaces/IJBDirectory.sol";
+import {JBConstants} from "src/libraries/JBConstants.sol";
+import {JBSplit} from "src/structs/JBSplit.sol";
+import {Test} from "forge-std/Test.sol";
 
 contract TestSplitsPacking_Local is JBSplits, Test {
     constructor() JBSplits(IJBDirectory(address(0))) {}

package/test/units/static/JBSurplus/TestSurplusFuzz.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 import {JBSurplus} from "../../../../src/libraries/JBSurplus.sol";
 

package/test/units/static/JBTerminalStore/JBTerminalStoreSetup.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*

package/test/units/static/JBTerminalStore/TestCurrentReclaimableSurplusOf.sol

@@ -1,7 +1,20 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 import {JBCashOuts} from "../../../../src/libraries/JBCashOuts.sol";
 

package/test/units/static/JBTerminalStore/TestCurrentSurplusOf.sol

@@ -1,7 +1,20 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 
 contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {

package/test/units/static/JBTerminalStore/TestCurrentTotalSurplusOf.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 
 contract TestCurrentTotalSurplusOf_Local is JBTerminalStoreSetup {