@bananapus/core-v6 0.0.9 → 0.0.10

package/src/JBPermissions.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 
 import {IJBPermissions} from "./interfaces/IJBPermissions.sol";
 import {JBPermissionsData} from "./structs/JBPermissionsData.sol";
@@ -52,60 +52,63 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
     constructor(address trustedForwarder) ERC2771Context(trustedForwarder) {}
 
     //*********************************************************************//
-    // -------------------------- public views --------------------------- //
+    // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
-    /// @notice Check if an operator has a specific permission for a specific address and project ID.
-    /// @param operator The operator to check.
-    /// @param account The account being operated on behalf of.
-    /// @param projectId The project ID that the operator has permission to operate under. 0 represents all projects.
-    /// @param permissionId The permission ID to check for.
-    /// @param includeRoot A flag indicating if the return value should default to true if the operator has the ROOT
-    /// permission.
-    /// @param includeWildcardProjectId A flag indicating if the return value should return true if the operator has the
-    /// specified permission on the wildcard project ID.
-    /// @return A flag indicating whether the operator has the specified permission.
-    function hasPermission(
-        address operator,
-        address account,
-        uint256 projectId,
-        uint256 permissionId,
-        bool includeRoot,
-        bool includeWildcardProjectId
-    )
-        public
-        view
-        override
-        returns (bool)
-    {
-        // Indexes above 255 don't exist
-        if (permissionId > 255) revert JBPermissions_PermissionIdOutOfBounds(permissionId);
+    /// @notice Sets permissions for an operator.
+    /// @dev Only an address can give permissions to or revoke permissions from its operators.
+    /// @param account The account setting its operators' permissions.
+    /// @param permissionsData The data which specifies the permissions the operator is being given.
+    function setPermissionsFor(address account, JBPermissionsData calldata permissionsData) external override {
+        // Pack the permission IDs into a uint256.
+        uint256 packed = _packedPermissions(permissionsData.permissionIds);
 
-        // If the ROOT permission is set and should be included, return true.
+        // Make sure the 0 permission is not set.
+        if (_includesPermission({permissions: packed, permissionId: 0})) revert JBPermissions_NoZeroPermission();
+
+        // Cache the sender.
+        address msgSender = _msgSender();
+
+        // Enforce permissions. ROOT operators are allowed to set permissions so long as they are not setting another
+        // ROOT permission or setting permissions for a wildcard project ID.
         if (
-            includeRoot
-                && (_includesPermission({
-                        permissions: permissionsOf[operator][account][projectId], permissionId: JBPermissionIds.ROOT
-                    })
-                    || (includeWildcardProjectId
-                        && _includesPermission({
-                            permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID],
-                            permissionId: JBPermissionIds.ROOT
-                        })))
+            msgSender != account
+                && (_includesPermission({permissions: packed, permissionId: JBPermissionIds.ROOT})
+                    || permissionsData.projectId == WILDCARD_PROJECT_ID
+                    || !hasPermission({
+                        operator: msgSender,
+                        account: account,
+                        projectId: permissionsData.projectId,
+                        permissionId: JBPermissionIds.ROOT,
+                        includeRoot: true,
+                        includeWildcardProjectId: true
+                    }))
         ) {
-            return true;
+            revert JBPermissions_Unauthorized({
+                account: account,
+                operator: msgSender,
+                projectId: permissionsData.projectId,
+                permissionId: JBPermissionIds.ROOT
+            });
         }
 
-        // Otherwise return the t/f flag of the specified id.
-        return _includesPermission({
-                permissions: permissionsOf[operator][account][projectId], permissionId: permissionId
-            })
-            || (includeWildcardProjectId
-                && _includesPermission({
-                    permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID], permissionId: permissionId
-                }));
+        // Store the new value.
+        permissionsOf[permissionsData.operator][account][permissionsData.projectId] = packed;
+
+        emit OperatorPermissionsSet({
+            operator: permissionsData.operator,
+            account: account,
+            projectId: permissionsData.projectId,
+            permissionIds: permissionsData.permissionIds,
+            packed: packed,
+            caller: msgSender
+        });
     }
 
+    //*********************************************************************//
+    // ------------------------- external views -------------------------- //
+    //*********************************************************************//
+
     /// @notice Check if an operator has all of the specified permissions for a specific address and project ID.
     /// @param operator The operator to check.
     /// @param account The account being operated on behalf of.
@@ -171,6 +174,61 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
         return true;
     }
 
+    //*********************************************************************//
+    // -------------------------- public views --------------------------- //
+    //*********************************************************************//
+
+    /// @notice Check if an operator has a specific permission for a specific address and project ID.
+    /// @param operator The operator to check.
+    /// @param account The account being operated on behalf of.
+    /// @param projectId The project ID that the operator has permission to operate under. 0 represents all projects.
+    /// @param permissionId The permission ID to check for.
+    /// @param includeRoot A flag indicating if the return value should default to true if the operator has the ROOT
+    /// permission.
+    /// @param includeWildcardProjectId A flag indicating if the return value should return true if the operator has the
+    /// specified permission on the wildcard project ID.
+    /// @return A flag indicating whether the operator has the specified permission.
+    function hasPermission(
+        address operator,
+        address account,
+        uint256 projectId,
+        uint256 permissionId,
+        bool includeRoot,
+        bool includeWildcardProjectId
+    )
+        public
+        view
+        override
+        returns (bool)
+    {
+        // Indexes above 255 don't exist
+        if (permissionId > 255) revert JBPermissions_PermissionIdOutOfBounds(permissionId);
+
+        // If the ROOT permission is set and should be included, return true.
+        if (
+            includeRoot
+                && (_includesPermission({
+                        permissions: permissionsOf[operator][account][projectId], permissionId: JBPermissionIds.ROOT
+                    })
+                    || (includeWildcardProjectId
+                        && _includesPermission({
+                            permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID],
+                            permissionId: JBPermissionIds.ROOT
+                        })))
+        ) {
+            return true;
+        }
+
+        // Otherwise return the t/f flag of the specified id.
+        return _includesPermission({
+                permissions: permissionsOf[operator][account][projectId], permissionId: permissionId
+            })
+            || (includeWildcardProjectId
+                && _includesPermission({
+                    permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID], permissionId: permissionId
+                }));
+    }
+
     //*********************************************************************//
     // -------------------------- internal views ------------------------- //
     //*********************************************************************//
@@ -195,58 +253,4 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
             packed |= 1 << permissionId;
         }
     }
-
-    //*********************************************************************//
-    // ---------------------- external transactions ---------------------- //
-    //*********************************************************************//
-
-    /// @notice Sets permissions for an operator.
-    /// @dev Only an address can give permissions to or revoke permissions from its operators.
-    /// @param account The account setting its operators' permissions.
-    /// @param permissionsData The data which specifies the permissions the operator is being given.
-    function setPermissionsFor(address account, JBPermissionsData calldata permissionsData) external override {
-        // Pack the permission IDs into a uint256.
-        uint256 packed = _packedPermissions(permissionsData.permissionIds);
-
-        // Make sure the 0 permission is not set.
-        if (_includesPermission({permissions: packed, permissionId: 0})) revert JBPermissions_NoZeroPermission();
-
-        // Cache the sender.
-        address msgSender = _msgSender();
-
-        // Enforce permissions. ROOT operators are allowed to set permissions so long as they are not setting another
-        // ROOT permission or setting permissions for a wildcard project ID.
-        if (
-            msgSender != account
-                && (_includesPermission({permissions: packed, permissionId: JBPermissionIds.ROOT})
-                    || permissionsData.projectId == WILDCARD_PROJECT_ID
-                    || !hasPermission({
-                        operator: msgSender,
-                        account: account,
-                        projectId: permissionsData.projectId,
-                        permissionId: JBPermissionIds.ROOT,
-                        includeRoot: true,
-                        includeWildcardProjectId: true
-                    }))
-        ) {
-            revert JBPermissions_Unauthorized({
-                account: account,
-                operator: msgSender,
-                projectId: permissionsData.projectId,
-                permissionId: JBPermissionIds.ROOT
-            });
-        }
-
-        // Store the new value.
-        permissionsOf[permissionsData.operator][account][permissionsData.projectId] = packed;
-
-        emit OperatorPermissionsSet({
-            operator: permissionsData.operator,
-            account: account,
-            projectId: permissionsData.projectId,
-            permissionIds: permissionsData.permissionIds,
-            packed: packed,
-            caller: msgSender
-        });
-    }
 }

package/src/JBPrices.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {ERC2771Context, Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC2771Context, Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {mulDiv} from "@prb/math/src/Common.sol";
 
 import {JBControlled} from "./abstract/JBControlled.sol";
@@ -79,6 +79,73 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
         PROJECTS = projects;
     }
 
+    //*********************************************************************//
+    // ---------------------- external transactions ---------------------- //
+    //*********************************************************************//
+
+    /// @notice Add a price feed for the `unitCurrency`, priced in terms of the `pricingCurrency`.
+    /// @dev Price feeds can only be added, not modified or removed. Once a feed is set for a currency pair (in either
+    /// direction), it is permanent for that project ID. Recovery from a misconfigured feed requires deploying a new
+    /// JBPrices contract.
+    /// @dev This contract's owner can add protocol-wide default price feed by passing a `projectId` of 0.
+    /// @param projectId The ID of the project to add a feed for. If `projectId` is 0, add a protocol-wide default price
+    /// feed.
+    /// @param pricingCurrency The currency the feed's output price is in terms of.
+    /// @param unitCurrency The currency being priced by the feed.
+    /// @param feed The address of the price feed to add.
+    function addPriceFeedFor(
+        uint256 projectId,
+        uint256 pricingCurrency,
+        uint256 unitCurrency,
+        IJBPriceFeed feed
+    )
+        external
+        override
+    {
+        // Ensure default price feeds can only be set by this contract's owner, and that other `projectId`s can only be
+        // set by the controller
+        projectId == DEFAULT_PROJECT_ID ? _checkOwner() : _onlyControllerOf(projectId);
+
+        // Make sure the pricing currency isn't 0.
+        if (pricingCurrency == 0) revert JBPrices_ZeroPricingCurrency();
+
+        // Make sure the unit currency isn't 0.
+        if (unitCurrency == 0) revert JBPrices_ZeroUnitCurrency();
+
+        // Make sure there isn't already a default price feed for the pair or its inverse.
+        if (
+            priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
+                || priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
+        ) {
+            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
+                    != IJBPriceFeed(address(0))
+                    ? priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
+                    : priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency]);
+        }
+
+        // Make sure this project doesn't already have a price feed for the pair or its inverse.
+        if (
+            priceFeedFor[projectId][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
+                || priceFeedFor[projectId][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
+        ) {
+            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[projectId][pricingCurrency][unitCurrency]
+                    != IJBPriceFeed(address(0))
+                    ? priceFeedFor[projectId][pricingCurrency][unitCurrency]
+                    : priceFeedFor[projectId][unitCurrency][pricingCurrency]);
+        }
+
+        // Store the feed.
+        priceFeedFor[projectId][pricingCurrency][unitCurrency] = feed;
+
+        emit AddPriceFeed({
+            projectId: projectId,
+            pricingCurrency: pricingCurrency,
+            unitCurrency: unitCurrency,
+            feed: feed,
+            caller: _msgSender()
+        });
+    }
+
     //*********************************************************************//
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
@@ -157,71 +224,4 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
     function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
         return ERC2771Context._msgSender();
     }
-
-    //*********************************************************************//
-    // ---------------------- external transactions ---------------------- //
-    //*********************************************************************//
-
-    /// @notice Add a price feed for the `unitCurrency`, priced in terms of the `pricingCurrency`.
-    /// @dev Price feeds can only be added, not modified or removed. Once a feed is set for a currency pair (in either
-    /// direction), it is permanent for that project ID. Recovery from a misconfigured feed requires deploying a new
-    /// JBPrices contract.
-    /// @dev This contract's owner can add protocol-wide default price feed by passing a `projectId` of 0.
-    /// @param projectId The ID of the project to add a feed for. If `projectId` is 0, add a protocol-wide default price
-    /// feed.
-    /// @param pricingCurrency The currency the feed's output price is in terms of.
-    /// @param unitCurrency The currency being priced by the feed.
-    /// @param feed The address of the price feed to add.
-    function addPriceFeedFor(
-        uint256 projectId,
-        uint256 pricingCurrency,
-        uint256 unitCurrency,
-        IJBPriceFeed feed
-    )
-        external
-        override
-    {
-        // Ensure default price feeds can only be set by this contract's owner, and that other `projectId`s can only be
-        // set by the controller
-        projectId == DEFAULT_PROJECT_ID ? _checkOwner() : _onlyControllerOf(projectId);
-
-        // Make sure the pricing currency isn't 0.
-        if (pricingCurrency == 0) revert JBPrices_ZeroPricingCurrency();
-
-        // Make sure the unit currency isn't 0.
-        if (unitCurrency == 0) revert JBPrices_ZeroUnitCurrency();
-
-        // Make sure there isn't already a default price feed for the pair or its inverse.
-        if (
-            priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
-                || priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
-        ) {
-            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
-                    != IJBPriceFeed(address(0))
-                    ? priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
-                    : priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency]);
-        }
-
-        // Make sure this project doesn't already have a price feed for the pair or its inverse.
-        if (
-            priceFeedFor[projectId][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
-                || priceFeedFor[projectId][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
-        ) {
-            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[projectId][pricingCurrency][unitCurrency]
-                    != IJBPriceFeed(address(0))
-                    ? priceFeedFor[projectId][pricingCurrency][unitCurrency]
-                    : priceFeedFor[projectId][unitCurrency][pricingCurrency]);
-        }
-
-        // Store the feed.
-        priceFeedFor[projectId][pricingCurrency][unitCurrency] = feed;
-
-        emit AddPriceFeed({
-            projectId: projectId,
-            pricingCurrency: pricingCurrency,
-            unitCurrency: unitCurrency,
-            feed: feed,
-            caller: _msgSender()
-        });
-    }
 }

package/src/JBProjects.sol

@@ -46,6 +46,37 @@ contract JBProjects is ERC721, ERC2771Context, Ownable, IJBProjects {
         }
     }
 
+    //*********************************************************************//
+    // ---------------------- external transactions ---------------------- //
+    //*********************************************************************//
+
+    /// @notice Sets the address of the resolver used to retrieve the tokenURI of projects.
+    /// @param resolver The address of the new resolver.
+    function setTokenUriResolver(IJBTokenUriResolver resolver) external override onlyOwner {
+        // Store the new resolver.
+        tokenUriResolver = resolver;
+
+        emit SetTokenUriResolver({resolver: resolver, caller: _msgSender()});
+    }
+
+    //*********************************************************************//
+    // ----------------------- public transactions ----------------------- //
+    //*********************************************************************//
+
+    /// @notice Create a new project for the specified owner, which mints an NFT (ERC-721) into their wallet.
+    /// @dev Anyone can create a project on an owner's behalf.
+    /// @param owner The address that will be the owner of the project.
+    /// @return projectId The token ID of the newly created project.
+    function createFor(address owner) public override returns (uint256 projectId) {
+        // Increment the count, which will be used as the ID.
+        projectId = ++count;
+
+        emit Create({projectId: projectId, owner: owner, caller: _msgSender()});
+
+        // Mint the project.
+        _safeMint(owner, projectId);
+    }
+
     //*********************************************************************//
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
@@ -92,35 +123,4 @@ contract JBProjects is ERC721, ERC2771Context, Ownable, IJBProjects {
     function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
         return ERC2771Context._msgSender();
     }
-
-    //*********************************************************************//
-    // ---------------------- external transactions ---------------------- //
-    //*********************************************************************//
-
-    /// @notice Sets the address of the resolver used to retrieve the tokenURI of projects.
-    /// @param resolver The address of the new resolver.
-    function setTokenUriResolver(IJBTokenUriResolver resolver) external override onlyOwner {
-        // Store the new resolver.
-        tokenUriResolver = resolver;
-
-        emit SetTokenUriResolver({resolver: resolver, caller: _msgSender()});
-    }
-
-    //*********************************************************************//
-    // ---------------------- public transactions ---------------------- //
-    //*********************************************************************//
-
-    /// @notice Create a new project for the specified owner, which mints an NFT (ERC-721) into their wallet.
-    /// @dev Anyone can create a project on an owner's behalf.
-    /// @param owner The address that will be the owner of the project.
-    /// @return projectId The token ID of the newly created project.
-    function createFor(address owner) public override returns (uint256 projectId) {
-        // Increment the count, which will be used as the ID.
-        projectId = ++count;
-
-        emit Create({projectId: projectId, owner: owner, caller: _msgSender()});
-
-        // Mint the project.
-        _safeMint(owner, projectId);
-    }
 }