NO-JIRA [fix] remove accesscontrolenumerable from oalenforced (#224)

Author: jasonzwli

contracts/allowlist/OperatorAllowlistEnforced.sol

@@ -6,8 +6,8 @@ pragma solidity 0.8.19;
 // Allowlist Registry
 import {IOperatorAllowlist} from "./IOperatorAllowlist.sol";
 
-// Access Control
-import {AccessControlEnumerable, IERC165} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
+// Interface
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 
 // Errors
 import {OperatorAllowlistEnforcementErrors} from "../errors/Errors.sol";
@@ -19,7 +19,7 @@ import {OperatorAllowlistEnforcementErrors} from "../errors/Errors.sol";
     OperatorAllowlistEnforced is not designed to be upgradeable or extended.
 */
 
-abstract contract OperatorAllowlistEnforced is AccessControlEnumerable, OperatorAllowlistEnforcementErrors {
+abstract contract OperatorAllowlistEnforced is OperatorAllowlistEnforcementErrors {
     ///     =====   State Variables  =====
 
     /// @notice Interface that implements the `IOperatorAllowlist` interface
@@ -88,14 +88,6 @@ abstract contract OperatorAllowlistEnforced is AccessControlEnumerable, Operator
 
     ///     =====  External functions  =====
 
-    /**
-     * @notice ERC-165 interface support
-     * @param interfaceId The interface identifier, which is a 4-byte selector.
-     */
-    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return super.supportsInterface(interfaceId);
-    }
-
     /**
      * @notice Internal function to set the operator allowlist the calling contract will interface with
      * @param _operatorAllowlist the address of the Allowlist registry

contracts/token/erc1155/abstract/ImmutableERC1155Base.sol

@@ -8,16 +8,16 @@ import {ERC1155, ERC1155Permit} from "../../../token/erc1155/abstract/ERC1155Per
 import {ERC2981} from "@openzeppelin/contracts/token/common/ERC2981.sol";
 import {OperatorAllowlistEnforced} from "../../../allowlist/OperatorAllowlistEnforced.sol";
 
-abstract contract ImmutableERC1155Base is OperatorAllowlistEnforced, ERC1155Permit, ERC2981 {
+import {AccessControlEnumerable, MintingAccessControl} from "../../../access/MintingAccessControl.sol";
+
+
+abstract contract ImmutableERC1155Base is OperatorAllowlistEnforced, ERC1155Permit, ERC2981, MintingAccessControl {
     /// @dev Contract level metadata
     string public contractURI;
 
     /// @dev Common URIs for individual token URIs
     string private _baseURI;
 
-    /// @dev Only MINTER_ROLE can invoke permissioned mint.
-    bytes32 public constant MINTER_ROLE = bytes32("MINTER_ROLE");
-
     /// @dev mapping of each token id supply
     mapping(uint256 tokenId => uint256 totalSupply) private _totalSupply;
 
@@ -92,22 +92,6 @@ abstract contract ImmutableERC1155Base is OperatorAllowlistEnforced, ERC1155Perm
         }
     }
 
-    /**
-     * @notice Grants minter role to the user
-     * @param user The address to grant the MINTER_ROLE to
-     */
-    function grantMinterRole(address user) public onlyRole(DEFAULT_ADMIN_ROLE) {
-        grantRole(MINTER_ROLE, user);
-    }
-
-    /**
-     * @notice Allows admin to revoke `MINTER_ROLE` role from `user`
-     * @param user The address to revoke the MINTER_ROLE from
-     */
-    function revokeMinterRole(address user) public onlyRole(DEFAULT_ADMIN_ROLE) {
-        revokeRole(MINTER_ROLE, user);
-    }
-
     /**
      * @notice Override of setApprovalForAll from {ERC721}, with added Allowlist approval validation
      * @param operator The address to approve as an operator for the caller.
@@ -154,7 +138,7 @@ abstract contract ImmutableERC1155Base is OperatorAllowlistEnforced, ERC1155Perm
      */
     function supportsInterface(
         bytes4 interfaceId
-    ) public view virtual override(ERC1155Permit, ERC2981, OperatorAllowlistEnforced) returns (bool) {
+    ) public view virtual override(ERC1155Permit, ERC2981, AccessControlEnumerable) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
 
@@ -190,19 +174,6 @@ abstract contract ImmutableERC1155Base is OperatorAllowlistEnforced, ERC1155Perm
         return _baseURI;
     }
 
-    /**
-     * @notice Returns the addresses which have DEFAULT_ADMIN_ROLE
-     * @return admins The addresses which have DEFAULT_ADMIN_ROLE
-     */
-    function getAdmins() public view returns (address[] memory) {
-        uint256 adminCount = getRoleMemberCount(DEFAULT_ADMIN_ROLE);
-        address[] memory admins = new address[](adminCount);
-        for (uint256 i; i < adminCount; i++) {
-            admins[i] = getRoleMember(DEFAULT_ADMIN_ROLE, i);
-        }
-        return admins;
-    }
-
     /**
      * @notice See Openzepplin ERC1155._beforeTokenTransfer.
      * @param operator The address performing the transfer.

contracts/token/erc721/abstract/ImmutableERC721Base.sol

@@ -201,7 +201,7 @@ abstract contract ImmutableERC721Base is OperatorAllowlistEnforced, MintingAcces
         public
         view
         virtual
-        override(ERC721Permit, ERC2981, OperatorAllowlistEnforced, AccessControlEnumerable)
+        override(ERC721Permit, ERC2981, AccessControlEnumerable)
         returns (bool)
     {
         return super.supportsInterface(interfaceId);

contracts/token/erc721/abstract/ImmutableERC721HybridBase.sol

@@ -57,7 +57,7 @@ abstract contract ImmutableERC721HybridBase is
         public
         view
         virtual
-        override(ERC721HybridPermit, ERC2981, OperatorAllowlistEnforced, AccessControlEnumerable)
+        override(ERC721HybridPermit, ERC2981, AccessControlEnumerable)
         returns (bool)
     {
         return super.supportsInterface(interfaceId);