Update Permissions and use it in SignatureDrop

Author: Krishang Nadgauda

contracts/drop/SignatureDrop.sol

@@ -31,6 +31,7 @@ import "../feature/PrimarySale.sol";
 import "../feature/Ownable.sol";
 import "../feature/DelayedReveal.sol";
 import "../feature/LazyMint.sol";
+import "../feature/PermissionsEnumerable.sol";
 import "../feature/SignatureMintERC721Upgradeable.sol";
 
 contract SignatureDrop is
@@ -42,12 +43,12 @@ contract SignatureDrop is
     Ownable,
     DelayedReveal,
     LazyMint,
+    PermissionsEnumerable,
     SignatureMintERC721Upgradeable,
     IDropClaimCondition,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,
-    AccessControlEnumerableUpgradeable,
     ERC721AUpgradeable
 {
     using StringsUpgradeable for uint256;
@@ -171,7 +172,7 @@ contract SignatureDrop is
         public
         view
         virtual
-        override(ERC721AUpgradeable, AccessControlEnumerableUpgradeable)
+        override(ERC721AUpgradeable)
         returns (bool)
     {
         return super.supportsInterface(interfaceId) || type(IERC2981Upgradeable).interfaceId == interfaceId;
@@ -410,7 +411,7 @@ contract SignatureDrop is
         internal
         view
         virtual
-        override(ContextUpgradeable, ERC2771ContextUpgradeable)
+        override(ContextUpgradeable, ERC2771ContextUpgradeable, Context)
         returns (address sender)
     {
         return ERC2771ContextUpgradeable._msgSender();
@@ -420,7 +421,7 @@ contract SignatureDrop is
         internal
         view
         virtual
-        override(ContextUpgradeable, ERC2771ContextUpgradeable)
+        override(ContextUpgradeable, ERC2771ContextUpgradeable, Context)
         returns (bytes calldata)
     {
         return ERC2771ContextUpgradeable._msgData();

contracts/feature/Permissions.sol

@@ -7,23 +7,36 @@ import "../lib/Strings.sol";
 
 contract Permissions is IPermissions, Context {
 
-    mapping(bytes32 => mapping(address => bool)) public hasRole;
-    mapping(bytes32 => bytes32) public getRoleAdmin;
+    mapping(bytes32 => mapping(address => bool)) private _hasRole;
+    mapping(bytes32 => bytes32) private _getRoleAdmin;
 
     bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00;
 
+    modifier onlyRole(bytes32 role) {
+        _checkRole(role, _msgSender());
+        _;
+    }
+
+    function hasRole(bytes32 role, address account) public view returns (bool) {
+        return _hasRole[role][account];
+    }
+
+    function getRoleAdmin(bytes32 role) public view returns (bytes32) {
+        return _getRoleAdmin[role];
+    }
+
     function grantRole(bytes32 role, address account) public virtual {
-        _checkRole(getRoleAdmin[role], _msgSender());
+        _checkRole(_getRoleAdmin[role], _msgSender());
 
-        hasRole[role][account] = true;
+        _hasRole[role][account] = true;
 
         emit RoleGranted(role, account, _msgSender());
     }
 
     function revokeRole(bytes32 role, address account) public virtual {
-        _checkRole(getRoleAdmin[role], _msgSender());
+        _checkRole(_getRoleAdmin[role], _msgSender());
 
-        delete hasRole[role][account];
+        delete _hasRole[role][account];
 
         emit RoleRevoked(role, account, _msgSender());
     }
@@ -34,13 +47,18 @@ contract Permissions is IPermissions, Context {
             "Can only renounce for self"
         );
 
-        delete hasRole[role][account];
+        delete _hasRole[role][account];
 
         emit RoleRevoked(role, account, _msgSender());
     }
 
+    function _setupRole(bytes32 role, address account) internal virtual {
+        _hasRole[role][account] = true;
+        emit RoleGranted(role, account, _msgSender());
+    }
+
     function _checkRole(bytes32 role, address account) internal view virtual {
-        if (!hasRole[role][account]) {
+        if (!_hasRole[role][account]) {
             revert(
                 string(
                     abi.encodePacked(

contracts/feature/PermissionsEnumerable.sol

@@ -55,6 +55,11 @@ contract PermissionsEnumerable is IPermissionsEnumerable, Permissions  {
         _removeMember(role, account);
     }
 
+    function _setupRole(bytes32 role, address account) internal override {
+        super._setupRole(role, account);
+        _addMember(role, account);
+    }
+
     function _addMember(bytes32 role, address account) internal {        
         uint256 idx = roleMembers[role].index;
         roleMembers[role].index += 1;