@bananapus/ownable-v6 0.0.21 → 0.0.23

package/test/handlers/OwnableHandler.sol

@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.28;
-
-// import { Test } from "forge-std/Test.sol";
-import {CommonBase} from "forge-std/Base.sol";
-import {StdCheats} from "forge-std/StdCheats.sol";
-import {StdUtils} from "forge-std/StdUtils.sol";
-import {MockOwnable} from "../mocks/MockOwnable.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
-import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
-
-contract OwnableHandler is CommonBase, StdCheats, StdUtils {
-    IJBProjects public immutable PROJECTS;
-    IJBPermissions public immutable PERMISSIONS;
-    MockOwnable public immutable OWNABLE;
-
-    address[] public actors;
-    address internal currentActor;
-
-    // Ghost variables for tracking state.
-    uint256 public transferCount;
-    uint256 public renounceCount;
-    uint256 public projectTransferCount;
-    bool public wasEverRenounced;
-
-    modifier useActor(uint256 actorIndexSeed) {
-        currentActor = actors[bound(actorIndexSeed, 0, actors.length - 1)];
-        vm.startPrank(currentActor);
-        _;
-        vm.stopPrank();
-    }
-
-    constructor() {
-        address deployer = vm.addr(1);
-        address initialOwner = vm.addr(2);
-        // Deploy the permissions contract.
-        PERMISSIONS = new JBPermissions(address(0));
-        // Deploy the `JBProjects` contract.
-        PROJECTS = new JBProjects(address(123), address(0), address(0));
-        // Deploy the `JBOwnable` contract.
-        vm.prank(deployer);
-        OWNABLE = new MockOwnable(PROJECTS, PERMISSIONS, initialOwner, uint88(0));
-
-        actors.push(deployer);
-        actors.push(initialOwner);
-        actors.push(address(420));
-    }
-
-    function transferOwnershipToAddress(uint256 actorIndexSeed, address _newOwner) public useActor(actorIndexSeed) {
-        // Skip zero address — that's renounceOwnership's job.
-        if (_newOwner == address(0)) return;
-
-        try OWNABLE.transferOwnership(_newOwner) {
-            transferCount++;
-        } catch {}
-    }
-
-    function renounceOwnership(uint256 actorIndexSeed) public useActor(actorIndexSeed) {
-        try OWNABLE.renounceOwnership() {
-            renounceCount++;
-            wasEverRenounced = true;
-        } catch {}
-    }
-
-    function transferOwnershipToProject(uint256 actorIndexSeed, uint256 projectId) public useActor(actorIndexSeed) {
-        // Bound to valid project ID range (1 to type(uint88).max).
-        projectId = bound(projectId, 1, type(uint88).max);
-
-        try OWNABLE.transferOwnershipToProject(projectId) {
-            projectTransferCount++;
-        } catch {}
-    }
-}

package/test/regression/BurnLockProtection.t.sol

@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.28;
-
-import {Test} from "forge-std/Test.sol";
-import {MockOwnable} from "../mocks/MockOwnable.sol";
-
-import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
-import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
-import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-
-/// @title BurnLockProtection
-/// @notice Verifies that if a project NFT is burned/invalidated,
-///         owner() returns address(0) and _checkOwner() reverts gracefully instead of
-///         permanently locking the contract with an unrecoverable revert.
-contract BurnLockProtection is Test {
-    IJBProjects projects;
-    IJBPermissions permissions;
-
-    address alice = makeAddr("alice");
-    address bob = makeAddr("bob");
-
-    function setUp() public {
-        permissions = new JBPermissions(address(0));
-        projects = new JBProjects(address(123), address(0), address(0));
-    }
-
-    /// @notice When a project NFT is burned (simulated via mockCallRevert), owner() should
-    ///         return address(0) instead of reverting — contract degrades to "renounced" state.
-    function test_burnedProjectNFT_ownerReturnsZero() public {
-        uint256 projectId = projects.createFor(alice);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        // Verify normal operation first.
-        assertEq(ownable.owner(), alice, "Owner should be alice before burn");
-
-        // Simulate project NFT burn by making ownerOf revert for this projectId.
-        vm.mockCallRevert(
-            address(projects), abi.encodeWithSelector(IERC721.ownerOf.selector, projectId), "ERC721: invalid token ID"
-        );
-
-        // After burn, owner() should return address(0) — NOT revert.
-        address resolvedOwner = ownable.owner();
-        assertEq(resolvedOwner, address(0), "owner() should return address(0) when project NFT is burned");
-    }
-
-    /// @notice When a project NFT is burned, _checkOwner() should revert with the standard
-    ///         Unauthorized error (not an unrecoverable ownerOf revert), making the contract
-    ///         behave as if ownership was renounced.
-    function test_burnedProjectNFT_checkOwnerRevertsGracefully() public {
-        uint256 projectId = projects.createFor(alice);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        // Alice can call the protected method before burn.
-        vm.prank(alice);
-        ownable.protectedMethod();
-
-        // Simulate project NFT burn.
-        vm.mockCallRevert(
-            address(projects), abi.encodeWithSelector(IERC721.ownerOf.selector, projectId), "ERC721: invalid token ID"
-        );
-
-        // After burn, nobody can call protected methods — but the revert is graceful
-        // (Unauthorized from _requirePermissionFrom, not a raw ownerOf revert).
-        vm.prank(alice);
-        vm.expectRevert();
-        ownable.protectedMethod();
-
-        vm.prank(bob);
-        vm.expectRevert();
-        ownable.protectedMethod();
-    }
-
-    /// @notice Address-based ownership is unaffected by the try-catch change.
-    function test_addressBasedOwnership_unaffectedByTryCatch() public {
-        MockOwnable ownable = new MockOwnable(projects, permissions, alice, 0);
-
-        assertEq(ownable.owner(), alice, "Owner should be alice");
-
-        vm.prank(alice);
-        ownable.protectedMethod();
-
-        // Transfer to bob.
-        vm.prank(alice);
-        ownable.transferOwnership(bob);
-        assertEq(ownable.owner(), bob, "Owner should be bob after transfer");
-
-        vm.prank(bob);
-        ownable.protectedMethod();
-    }
-
-    /// @notice Normal project-based ownership still works correctly after the fix.
-    function test_normalProjectOwnership_stillWorks() public {
-        uint256 projectId = projects.createFor(alice);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        assertEq(ownable.owner(), alice);
-
-        // Transfer project NFT.
-        vm.prank(alice);
-        projects.transferFrom(alice, bob, projectId);
-
-        assertEq(ownable.owner(), bob, "Owner should follow project NFT transfer");
-
-        vm.prank(bob);
-        ownable.protectedMethod();
-    }
-}

package/test/regression/RootPermissionBypassesPermissionIdZero.t.sol

@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.28;
-
-import {Test} from "forge-std/Test.sol";
-
-import {MockOwnable} from "../mocks/MockOwnable.sol";
-
-import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
-import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
-import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
-import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
-
-contract RootPermissionBypassesPermissionIdZeroTest is Test {
-    JBProjects internal projects;
-    JBPermissions internal permissions;
-
-    address internal alice = makeAddr("alice");
-    address internal operator = makeAddr("operator");
-
-    function setUp() public {
-        permissions = new JBPermissions(address(0));
-        projects = new JBProjects(address(this), address(0), address(0));
-    }
-
-    /// @notice After M-39 fix: ROOT operator is rejected when permissionId=0 (direct-owner-only mode).
-    function test_rootPermissionRejectedWhenPermissionIdIsZero() public {
-        uint256 projectId = projects.createFor(alice);
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        // Grant ROOT permission (id=1) to operator.
-        uint8[] memory permissionIds = new uint8[](1);
-        permissionIds[0] = 1;
-
-        vm.prank(alice);
-        permissions.setPermissionsFor(
-            alice, JBPermissionsData({operator: operator, projectId: uint56(projectId), permissionIds: permissionIds})
-        );
-
-        (, uint88 storedProjectId, uint8 permissionId) = ownable.jbOwner();
-        assertEq(storedProjectId, projectId);
-        assertEq(permissionId, 0, "expected direct-owner-only mode");
-
-        // Operator should be rejected when permissionId=0.
-        vm.prank(operator);
-        vm.expectRevert(
-            abi.encodeWithSelector(JBPermissioned.JBPermissioned_Unauthorized.selector, alice, operator, projectId, 0)
-        );
-        ownable.protectedMethod();
-    }
-
-    /// @notice Direct owner still works when permissionId=0.
-    function test_directOwnerStillWorksWithPermissionIdZero() public {
-        uint256 projectId = projects.createFor(alice);
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        (, uint88 storedProjectId, uint8 permissionId) = ownable.jbOwner();
-        assertEq(storedProjectId, projectId);
-        assertEq(permissionId, 0);
-
-        // Alice (project owner) should still be able to call the protected method.
-        vm.prank(alice);
-        ownable.protectedMethod();
-    }
-
-    /// @notice Non-zero permissionId still delegates correctly via the permission system.
-    function test_delegatedOperatorWorksWhenPermissionIdNonZero() public {
-        uint256 projectId = projects.createFor(alice);
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-
-        // Set permissionId to 42 (non-zero = delegation enabled).
-        vm.prank(alice);
-        ownable.setPermissionId(42);
-
-        // Grant permission 42 to operator.
-        uint8[] memory permissionIds = new uint8[](1);
-        permissionIds[0] = 42;
-
-        vm.prank(alice);
-        permissions.setPermissionsFor(
-            alice, JBPermissionsData({operator: operator, projectId: uint56(projectId), permissionIds: permissionIds})
-        );
-
-        // Operator should succeed with matching permissionId.
-        vm.prank(operator);
-        ownable.protectedMethod();
-    }
-}

package/test/regression/ZeroAddressValidation.t.sol

@@ -1,67 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.28;
-
-import {Test} from "forge-std/Test.sol";
-import {MockOwnable} from "../mocks/MockOwnable.sol";
-import {JBOwnableOverrides} from "../../src/JBOwnableOverrides.sol";
-
-import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
-import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
-
-/// @title ZeroAddressValidation
-/// @notice Verifies that deploying with a zero-address projects
-///         contract and a non-zero projectId reverts at construction time, preventing
-///         permanently broken project-based ownership.
-contract ZeroAddressValidation is Test {
-    IJBProjects projects;
-    IJBPermissions permissions;
-
-    address alice = makeAddr("alice");
-
-    function setUp() public {
-        permissions = new JBPermissions(address(0));
-        projects = new JBProjects(address(123), address(0), address(0));
-    }
-
-    /// @notice Deploying with projects=address(0) and non-zero projectId must revert.
-    function test_zeroProjectsWithProjectId_reverts() public {
-        vm.expectRevert(
-            abi.encodeWithSelector(JBOwnableOverrides.JBOwnableOverrides_ZeroAddressProjectsWithProjectOwner.selector)
-        );
-        new MockOwnable(IJBProjects(address(0)), permissions, address(0), uint88(1));
-    }
-
-    /// @notice Fuzz: any non-zero projectId with projects=address(0) must revert.
-    function testFuzz_zeroProjectsWithAnyProjectId_reverts(uint88 projectId) public {
-        vm.assume(projectId != 0);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(JBOwnableOverrides.JBOwnableOverrides_ZeroAddressProjectsWithProjectOwner.selector)
-        );
-        new MockOwnable(IJBProjects(address(0)), permissions, address(0), projectId);
-    }
-
-    /// @notice Deploying with projects=address(0) and projectId=0 (address-based ownership)
-    ///         should NOT revert for this error — it's valid as long as initialOwner != address(0).
-    function test_zeroProjectsWithAddressOwnership_succeeds() public {
-        // This is valid: address-based ownership with projects=address(0).
-        MockOwnable ownable = new MockOwnable(IJBProjects(address(0)), permissions, alice, uint88(0));
-        assertEq(ownable.owner(), alice, "Owner should be alice with address-based ownership");
-    }
-
-    /// @notice Normal deployment with valid projects contract and projectId succeeds.
-    function test_validProjectsWithProjectId_succeeds() public {
-        uint256 projectId = projects.createFor(alice);
-        // forge-lint: disable-next-line(unsafe-typecast)
-        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(projectId));
-        assertEq(ownable.owner(), alice, "Owner should be alice via project NFT");
-    }
-
-    /// @notice The existing check for both zero owner and zero projectId is still enforced.
-    function test_bothZero_stillReverts() public {
-        vm.expectRevert(abi.encodeWithSelector(JBOwnableOverrides.JBOwnableOverrides_InvalidNewOwner.selector));
-        new MockOwnable(projects, permissions, address(0), uint88(0));
-    }
-}