@artblocks/contracts 1.0.1 → 1.0.3

package/contracts/minter-suite/Minters/MinterPolyptychV0.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../interfaces/0.8.x/IGenArt721CoreContractV3_Engine.sol";
+import "../../interfaces/0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../interfaces/0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
 import "../../interfaces/0.8.x/IMinterFilterV0.sol";
 import "../../interfaces/0.8.x/IFilteredMinterHolderV2.sol";
 import "../../interfaces/0.8.x/IRandomizerPolyptychV0.sol";
@@ -12,18 +13,19 @@ import "@openzeppelin-4.5/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/structs/EnumerableSet.sol";
 
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 /**
  * @title Core contract interface for accessing the randomizer from the minter
  * @notice This interface provides the minter with access to the randomizer, allowing the
  * token hash seed for a newly-minted token to be assigned by the minter if the artist
- * has enabled the project as a polyptych. Polytptych projects must use the V3 engine
- * core contract, polyptych minter, and polyptych randomizer - this interface allows the
+ * has enabled the project as a polyptych. Polytptych projects must use the V3 core
+ * contract, polyptych minter, and polyptych randomizer - this interface allows the
  * minter to access the randomizer.
  */
 interface IGenArt721CoreContractV3WithRandomizer is
-    IGenArt721CoreContractV3_Engine
+    IGenArt721CoreContractV3_Base,
+    IGenArt721CoreContractExposesHashSeed
 {
     /// current randomizer contract
     function randomizerContract() external returns (IRandomizerPolyptychV0);
@@ -40,9 +42,9 @@ interface IGenArt721CoreContractV3WithRandomizer is
  * using the `incrementPolyptychProjectPanelId` function. Panel IDs for a project may only
  * be incremented such that panels must be minted in the order of their panel ID. Tokens
  * of the same project and panel ID may be minted in any order.
- * This is designed to be used with IGenArt721CoreContractV3_Engine contracts with an
+ * This is designed to be used with IGenArt721CoreContractExposesHashSeed contracts with an
  * active IPolyptychRandomizerV0 randomizer available for this minter to use.
- * This minter requires both a properly configured engine core contract and polyptych
+ * This minter requires both a properly configured core contract and polyptych
  * randomizer in order to mint polyptych tokens.
  * @author Art Blocks Inc.
  * @notice Privileged Roles and Ownership:
@@ -146,9 +148,9 @@ contract MinterPolyptychV0 is
     mapping(uint256 => mapping(address => mapping(uint256 => bool)))
         public allowedProjectHolders;
 
-    // modifier to restrict access to only AdminACL allowed calls
+    // function to restrict access to only AdminACL allowed calls
     // @dev defers which ACL contract is used to the core contract
-    modifier onlyCoreAdminACL(bytes4 _selector) {
+    function _onlyCoreAdminACL(bytes4 _selector) internal {
         require(
             genArtCoreContract.adminACLAllowed(
                 msg.sender,
@@ -157,16 +159,14 @@ contract MinterPolyptychV0 is
             ),
             "Only Core AdminACL allowed"
         );
-        _;
     }
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             msg.sender ==
                 genArtCoreContract.projectIdToArtistAddress(_projectId),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -216,8 +216,9 @@ contract MinterPolyptychV0 is
         address _ownedNFTAddress,
         uint256 _ownedNFTTokenId
     ) external view returns (bool panelMinted) {
-        bytes12 _tokenHash = IGenArt721CoreContractV3_Engine(_ownedNFTAddress)
-            .tokenIdToHashSeed(_ownedNFTTokenId);
+        bytes12 _tokenHash = IGenArt721CoreContractExposesHashSeed(
+            _ownedNFTAddress
+        ).tokenIdToHashSeed(_ownedNFTTokenId);
         require(_tokenHash != bytes32(0), "Invalid token hash seed");
         return polyptychPanelHashSeedIsMinted[_panelId][_tokenHash];
     }
@@ -229,13 +230,10 @@ contract MinterPolyptychV0 is
      * `projectId = tokenId / 1_000_000`
      * @param _NFTAddress NFT core address to be registered.
      */
-    function registerNFTAddress(
-        address _NFTAddress
-    ) external onlyCoreAdminACL(this.registerNFTAddress.selector) {
+    function registerNFTAddress(address _NFTAddress) external {
+        _onlyCoreAdminACL(this.registerNFTAddress.selector);
         // check that core contract implements the `tokenIdToHashSeed` function
-        IGenArt721CoreContractV3WithRandomizer(_NFTAddress).tokenIdToHashSeed(
-            0
-        );
+        IGenArt721CoreContractExposesHashSeed(_NFTAddress).tokenIdToHashSeed(0);
         _registeredNFTAddresses.add(_NFTAddress);
         emit RegisteredNFTAddress(_NFTAddress);
     }
@@ -246,9 +244,8 @@ contract MinterPolyptychV0 is
      * considered for adding to future allowlists.
      * @param _NFTAddress NFT core address to be unregistered.
      */
-    function unregisterNFTAddress(
-        address _NFTAddress
-    ) external onlyCoreAdminACL(this.unregisterNFTAddress.selector) {
+    function unregisterNFTAddress(address _NFTAddress) external {
+        _onlyCoreAdminACL(this.unregisterNFTAddress.selector);
         _registeredNFTAddresses.remove(_NFTAddress);
         emit UnregisteredNFTAddress(_NFTAddress);
     }
@@ -287,7 +284,8 @@ contract MinterPolyptychV0 is
         uint256[] memory _ownedNFTProjectIdsAdd,
         address[] memory _ownedNFTAddressesRemove,
         uint256[] memory _ownedNFTProjectIdsRemove
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         allowHoldersOfProjects(
             _projectId,
             _ownedNFTAddressesAdd,
@@ -339,7 +337,8 @@ contract MinterPolyptychV0 is
     function manuallyLimitProjectMaxInvocations(
         uint256 _projectId,
         uint256 _maxInvocations
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // CHECKS
         // ensure that the manually set maxInvocations is not greater than what is set on the core contract
         uint256 maxInvocations;
@@ -376,7 +375,8 @@ contract MinterPolyptychV0 is
     function updatePricePerTokenInWei(
         uint256 _projectId,
         uint256 _pricePerTokenInWei
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         _projectConfig.pricePerTokenInWei = _pricePerTokenInWei;
         _projectConfig.priceIsConfigured = true;
@@ -404,7 +404,8 @@ contract MinterPolyptychV0 is
         uint256 _projectId,
         string memory _currencySymbol,
         address _currencyAddress
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // require null address if symbol is "ETH"
         require(
             (keccak256(abi.encodePacked(_currencySymbol)) ==
@@ -531,9 +532,8 @@ contract MinterPolyptychV0 is
      * @notice Warning: Disabling purchaseTo is not supported on this minter.
      * This method exists purely for interface-conformance purposes.
      */
-    function togglePurchaseToDisabled(
-        uint256 _projectId
-    ) external view onlyArtist(_projectId) {
+    function togglePurchaseToDisabled(uint256 _projectId) external view {
+        _onlyArtist(_projectId);
         revert("Action not supported");
     }
 
@@ -755,7 +755,7 @@ contract MinterPolyptychV0 is
         // EFFECTS
 
         // we need to store the new token ID before it is minted so the randomizer can query it
-        IGenArt721CoreContractV3WithRandomizer _ownedNFTCoreContract = IGenArt721CoreContractV3WithRandomizer(
+        IGenArt721CoreContractExposesHashSeed _ownedNFTCoreContract = IGenArt721CoreContractExposesHashSeed(
                 _ownedNFTAddress
             );
         bytes12 _targetHashSeed = _ownedNFTCoreContract.tokenIdToHashSeed(
@@ -880,7 +880,8 @@ contract MinterPolyptychV0 is
         uint256 _projectId,
         address[] memory _ownedNFTAddresses,
         uint256[] memory _ownedNFTProjectIds
-    ) public onlyArtist(_projectId) {
+    ) public {
+        _onlyArtist(_projectId);
         // require same length arrays
         require(
             _ownedNFTAddresses.length == _ownedNFTProjectIds.length,
@@ -925,7 +926,8 @@ contract MinterPolyptychV0 is
         uint256 _projectId,
         address[] memory _ownedNFTAddresses,
         uint256[] memory _ownedNFTProjectIds
-    ) public onlyArtist(_projectId) {
+    ) public {
+        _onlyArtist(_projectId);
         // require same length arrays
         require(
             _ownedNFTAddresses.length == _ownedNFTProjectIds.length,
@@ -950,9 +952,8 @@ contract MinterPolyptychV0 is
      * @notice Allows the artist to increment the minter to the next polyptych panel
      * @param _projectId Project ID to increment to its next polyptych panel
      */
-    function incrementPolyptychProjectPanelId(
-        uint256 _projectId
-    ) public onlyArtist(_projectId) {
+    function incrementPolyptychProjectPanelId(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         projectConfig[_projectId].polyptychPanelId++;
     }