ON-483: prevent grant role override

OriumNetwork · Sep 25, 2023 · 071f5dd · 071f5dd
1 parent 2157b88
commit 071f5dd
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/contracts/RolesRegistry/RolesRegistry.sol b/contracts/RolesRegistry/RolesRegistry.sol
@@ -77,7 +77,15 @@ contract RolesRegistry is IERC7432 {
         bool _revocable,
         bytes calldata _data
     ) internal validExpirationDate(_expirationDate) {
-        // TODO: [Part3] How to handle the case where the role is already granted and not expired ?
+        address _lastGrantee = latestGrantees[_tokenAddress][_tokenId][_role];
+        RoleData memory _roleData = roleAssignments[_lastGrantee][_tokenAddress][_tokenId][_role];
+
+        bool _hasActiveAssignment = _roleData.expirationDate > block.timestamp;
+
+        if(_hasActiveAssignment) {
+            require(_roleData.revocable, "RolesRegistry: role is not revocable"); // means thats only revocable roles can be multiple assigned
+        }
+
         roleAssignments[_grantee][_tokenAddress][_tokenId][_role] = RoleData(_expirationDate, _revocable, _data);
         latestGrantees[_tokenAddress][_tokenId][_role] = _grantee;
         emit RoleGranted(_role, _tokenAddress, _tokenId, _grantor, _grantee, _expirationDate, _revocable, _data);