more gas efficient approach

aragon · Sep 24, 2024 · dc49577 · dc49577
1 parent b16defb
commit dc49577
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/packages/contracts/src/core/permission/PermissionManager.sol b/packages/contracts/src/core/permission/PermissionManager.sol
@@ -1030,30 +1030,27 @@ abstract contract PermissionManager is Initializable {
             return isRoot;
         }
 
-        // Check either caller is delegated or an owner.
         uint256 delegationFlags = _permission.delegations[_who];
-        uint256 ownerFlags = _permission.owners[_who];
-        uint256 flags = delegationFlags | ownerFlags;
 
         if (
             _operation == PermissionLib.Operation.Grant ||
             _operation == PermissionLib.Operation.GrantWithCondition
         ) {
-            if (_checkFlags(flags, GRANT_OWNER_FLAG)) {
-                if (_checkFlags(delegationFlags, GRANT_OWNER_FLAG)) {
-                    _permission.delegations[_who] = delegationFlags ^ GRANT_OWNER_FLAG;
-                }
+            if (_checkFlags(delegationFlags, GRANT_OWNER_FLAG)) {
+                _permission.delegations[_who] = delegationFlags ^ GRANT_OWNER_FLAG;
+                return true;
+            } else if (_checkFlags(_permission.owners[_who], GRANT_OWNER_FLAG)) {
                 return true;
             }
 
             return isRoot && _permission.grantCounter == 0;
         }
 
         if (_operation == PermissionLib.Operation.Revoke) {
-            if (_checkFlags(flags, REVOKE_OWNER_FLAG)) {
-                if (_checkFlags(delegationFlags, REVOKE_OWNER_FLAG)) {
-                    _permission.delegations[_who] = delegationFlags ^ REVOKE_OWNER_FLAG;
-                }
+            if (_checkFlags(delegationFlags, REVOKE_OWNER_FLAG)) {
+                _permission.delegations[_who] = delegationFlags ^ REVOKE_OWNER_FLAG;
+                return true;
+            } else if (_checkFlags(_permission.owners[_who], REVOKE_OWNER_FLAG)) {
                 return true;
             }