feat: update access control for setRoleAdmin

ubiquity · Jan 19, 2024 · 3185ffd · 3185ffd
1 parent 2a2a0e3
commit 3185ffd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/packages/contracts/src/dollar/access/AccessControlInternal.sol b/packages/contracts/src/dollar/access/AccessControlInternal.sol
@@ -83,6 +83,18 @@ abstract contract AccessControlInternal {
         return LibAccessControl.accessControlStorage().roles[role].adminRole;
     }
 
+    /**
+     * @notice Set admin role for a given role
+     * @param role Role to set
+     * @param adminRole role for the provided role
+     */
+    function _setRoleAdmin(bytes32 role, bytes32 adminRole) internal virtual {
+        LibAccessControl
+            .accessControlStorage()
+            .roles[role]
+            .adminRole = adminRole;
+    }
+
     /**
      * @notice Assigns role to a given account
      * @param role Role to assign

diff --git a/packages/contracts/src/dollar/facets/AccessControlFacet.sol b/packages/contracts/src/dollar/facets/AccessControlFacet.sol
@@ -26,7 +26,7 @@ contract AccessControlFacet is
 
     /// @inheritdoc IAccessControl
     function setRoleAdmin(bytes32 role, bytes32 adminRole) external onlyAdmin {
-        return setRoleAdmin(role, adminRole);
+        _setRoleAdmin(role, adminRole);
     }
 
     /// @inheritdoc IAccessControl

diff --git a/packages/contracts/src/dollar/interfaces/IAccessControl.sol b/packages/contracts/src/dollar/interfaces/IAccessControl.sol
@@ -25,7 +25,7 @@ interface IAccessControl {
     /**
      * @notice Sets admin role for a given role
      * @param role Role to set
-     * @return adminRole Admin role to set for a provided role
+     * @param adminRole Admin role to set for a provided role
      */
     function setRoleAdmin(bytes32 role, bytes32 adminRole) external;
 

diff --git a/packages/contracts/test/diamond/facets/AccessControlFacet.t.sol b/packages/contracts/test/diamond/facets/AccessControlFacet.t.sol
@@ -142,13 +142,12 @@ contract AccessControlFacetTest is DiamondTestSetup {
             DOLLAR_TOKEN_MINTER_ROLE
         );
         assertEq(adminRole, DOLLAR_TOKEN_MINTER_ROLE);
+        vm.prank(admin);
         accessControlFacet.setRoleAdmin(
             DOLLAR_TOKEN_MINTER_ROLE,
             DOLLAR_TOKEN_BURNER_ROLE
         );
-        bytes32 adminRole = accessControlFacet.getRoleAdmin(
-            DOLLAR_TOKEN_MINTER_ROLE
-        );
+        adminRole = accessControlFacet.getRoleAdmin(DOLLAR_TOKEN_MINTER_ROLE);
         assertEq(adminRole, DOLLAR_TOKEN_BURNER_ROLE);
     }
 }