@bananapus/ownable-v6 0.0.16 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/ownable-v6",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@bananapus/core-v6": "^0.0.30",
+    "@bananapus/core-v6": "^0.0.31",
     "@bananapus/permission-ids-v6": "^0.0.15",
     "@openzeppelin/contracts": "^5.6.1"
   },

package/src/JBOwnable.sol

@@ -59,8 +59,8 @@ contract JBOwnable is JBOwnableOverrides {
     /// @dev This function exists because some contracts need to deploy contracts for a project before the project's NFT
     /// has been minted, so the transfer event resolves the project's current owner at emission time.
     /// @dev Unlike `_transferOwnership` (which uses try-catch to resolve the *old* owner in case its project NFT was
-    /// burned), this function intentionally lets `PROJECTS.ownerOf(newProjectId)` revert if the new project doesn't
-    /// exist. A revert here is desirable — it prevents transferring ownership to a non-existent project.
+    /// burned), this function resolves the *new* owner's current address for event purposes only.
+    /// If the new project NFT does not exist yet, the event uses `address(0)` until ownership can resolve normally.
     function _emitTransferEvent(
         address previousOwner,
         address newOwner,
@@ -70,10 +70,17 @@ contract JBOwnable is JBOwnableOverrides {
         virtual
         override
     {
-        emit OwnershipTransferred({
-            previousOwner: previousOwner,
-            newOwner: newProjectId == 0 ? newOwner : PROJECTS.ownerOf(newProjectId),
-            caller: _msgSender()
-        });
+        address resolvedNewOwner = newOwner;
+        if (newProjectId != 0) {
+            try PROJECTS.ownerOf(newProjectId) returns (address projectOwner) {
+                resolvedNewOwner = projectOwner;
+            } catch {
+                // Allow constructor-time handoff to an unminted project. Ownership resolves dynamically
+                // once the project NFT exists, so the transfer event uses address(0) until then.
+                resolvedNewOwner = address(0);
+            }
+        }
+
+        emit OwnershipTransferred({previousOwner: previousOwner, newOwner: resolvedNewOwner, caller: _msgSender()});
     }
 }

package/test/OwnableEdgeCases.t.sol

@@ -292,7 +292,23 @@ contract OwnableEdgeCases is Test {
     }
 
     // =========================================================================
-    // Test 10: Fuzz — transfer to any valid project, verify owner resolution
+    // Test 10: Constructor tolerates an unminted project owner
+    // =========================================================================
+    function test_constructorWithUnmintedProject_emitsZeroOwnerUntilMinted() public {
+        vm.expectEmit(true, true, false, true);
+        emit IJBOwnable.OwnershipTransferred(address(0), address(0), address(this));
+
+        MockOwnable ownable = new MockOwnable(projects, permissions, address(0), uint88(1));
+
+        assertEq(ownable.owner(), address(0), "Owner should resolve to zero before the project exists");
+
+        uint256 projectId = projects.createFor(alice);
+        assertEq(projectId, 1, "Expected the first minted project to match the configured future owner");
+        assertEq(ownable.owner(), alice, "Owner should resolve once the project is minted");
+    }
+
+    // =========================================================================
+    // Test 11: Fuzz — transfer to any valid project, verify owner resolution
     // =========================================================================
     function testFuzz_transferToProject(address projectOwner) public isNotContract(projectOwner) {
         vm.assume(projectOwner != address(0));
@@ -313,7 +329,7 @@ contract OwnableEdgeCases is Test {
     }
 
     // =========================================================================
-    // Test 11: Renounced contract cannot reclaim ownership
+    // Test 12: Renounced contract cannot reclaim ownership
     // =========================================================================
     /// @notice After renouncing, no one can call transferOwnership, transferOwnershipToProject,
     ///         setPermissionId, or renounceOwnership again.
@@ -350,7 +366,7 @@ contract OwnableEdgeCases is Test {
     }
 
     // =========================================================================
-    // Test 12: _msgSender is NOT ERC2771-aware (design documentation)
+    // Test 13: _msgSender is NOT ERC2771-aware (design documentation)
     // =========================================================================
     /// @notice JBOwnable uses plain Context._msgSender() (returns msg.sender),
     ///         NOT ERC2771Context. This test documents that a trusted forwarder
@@ -374,7 +390,7 @@ contract OwnableEdgeCases is Test {
     }
 
     // =========================================================================
-    // Test 13: OwnershipTransferred event uses _msgSender() (L-27 fix)
+    // Test 14: OwnershipTransferred event uses _msgSender() (L-27 fix)
     // =========================================================================
     /// @notice When a subclass overrides _msgSender() (e.g., for ERC-2771),
     ///         the OwnershipTransferred event's caller field should reflect the
@@ -397,7 +413,7 @@ contract OwnableEdgeCases is Test {
     }
 
     // =========================================================================
-    // Test 14: PermissionIdChanged event uses _msgSender() (L-27 fix)
+    // Test 15: PermissionIdChanged event uses _msgSender() (L-27 fix)
     // =========================================================================
     /// @notice When a subclass overrides _msgSender() (e.g., for ERC-2771),
     ///         the PermissionIdChanged event's caller field should reflect the