@artblocks/contracts 1.0.1 → 1.0.2

package/contracts/minter-suite/MinterFilter/MinterFilterV1.sol

@@ -27,8 +27,8 @@ pragma solidity 0.8.17;
  * ----------------------------------------------------------------------------
  * The following functions are restricted to the core contract's Admin ACL
  * contract:
- * - addApprovedMinters
- * - removeApprovedMinters
+ * - addApprovedMinter
+ * - removeApprovedMinter
  * - removeMintersForProjects
  * ----------------------------------------------------------------------------
  * The following functions are restricted to the core contract's Admin ACL
@@ -72,45 +72,43 @@ contract MinterFilterV1 is IMinterFilterV0 {
     /// minter address => is an approved minter?
     mapping(address => bool) public isApprovedMinter;
 
-    modifier onlyNonZeroAddress(address _address) {
+    function _onlyNonZeroAddress(address _address) internal pure {
         require(_address != address(0), "Must input non-zero address");
-        _;
     }
 
-    // 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(_coreAdminACLAllowed(_selector), "Only Core AdminACL allowed");
-        _;
     }
 
-    // modifier to restrict access to only the artist of `_projectId`, or
+    // function to restrict access to only the artist of `_projectId`, or
     // AdminACL allowed calls
     // @dev defers which ACL contract is used to the core contract
-    modifier onlyCoreAdminACLOrArtist(uint256 _projectId, bytes4 _selector) {
+    function _onlyCoreAdminACLOrArtist(
+        uint256 _projectId,
+        bytes4 _selector
+    ) internal {
         require(
             msg.sender ==
                 genArtCoreContract.projectIdToArtistAddress(_projectId) ||
                 _coreAdminACLAllowed(_selector),
             "Only Core AdminACL or Artist"
         );
-        _;
     }
 
-    modifier onlyValidProjectId(uint256 _projectId) {
+    function _onlyValidProjectId(uint256 _projectId) internal view {
         require(
             _projectId < genArtCoreContract.nextProjectId(),
             "Only existing projects"
         );
-        _;
     }
 
-    modifier usingApprovedMinter(address _minterAddress) {
+    function _usingApprovedMinter(address _minterAddress) internal view {
         require(
             isApprovedMinter[_minterAddress],
             "Only approved minters are allowed"
         );
-        _;
     }
 
     /**
@@ -118,9 +116,8 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @param _genArt721Address Art Blocks core contract address
      * this contract will be a minter for. Can never be updated.
      */
-    constructor(
-        address _genArt721Address
-    ) onlyNonZeroAddress(_genArt721Address) {
+    constructor(address _genArt721Address) {
+        _onlyNonZeroAddress(_genArt721Address);
         genArt721CoreAddress = _genArt721Address;
         genArtCoreContract = IGenArt721CoreContractV3(_genArt721Address);
         emit Deployed();
@@ -144,13 +141,9 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @notice Approves minter `_minterAddress`.
      * @param _minterAddress Minter to be added as an approved minter.
      */
-    function addApprovedMinter(
-        address _minterAddress
-    )
-        external
-        onlyCoreAdminACL(this.addApprovedMinter.selector)
-        onlyNonZeroAddress(_minterAddress)
-    {
+    function addApprovedMinter(address _minterAddress) external {
+        _onlyCoreAdminACL(this.addApprovedMinter.selector);
+        _onlyNonZeroAddress(_minterAddress);
         isApprovedMinter[_minterAddress] = true;
         emit MinterApproved(
             _minterAddress,
@@ -162,9 +155,8 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @notice Removes previously approved minter `_minterAddress`.
      * @param _minterAddress Minter to remove.
      */
-    function removeApprovedMinter(
-        address _minterAddress
-    ) external onlyCoreAdminACL(this.removeApprovedMinter.selector) {
+    function removeApprovedMinter(address _minterAddress) external {
+        _onlyCoreAdminACL(this.removeApprovedMinter.selector);
         require(isApprovedMinter[_minterAddress], "Only approved minters");
         require(
             numProjectsUsingMinter[_minterAddress] == 0,
@@ -183,12 +175,13 @@ contract MinterFilterV1 is IMinterFilterV0 {
     function setMinterForProject(
         uint256 _projectId,
         address _minterAddress
-    )
-        external
-        onlyCoreAdminACLOrArtist(_projectId, this.setMinterForProject.selector)
-        usingApprovedMinter(_minterAddress)
-        onlyValidProjectId(_projectId)
-    {
+    ) external {
+        _onlyCoreAdminACLOrArtist(
+            _projectId,
+            this.setMinterForProject.selector
+        );
+        _usingApprovedMinter(_minterAddress);
+        _onlyValidProjectId(_projectId);
         // decrement number of projects using a previous minter
         (bool hasPreviousMinter, address previousMinter) = minterForProject
             .tryGet(_projectId);
@@ -210,15 +203,11 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @param _projectId Project ID to remove minter.
      * @dev requires project to have an assigned minter
      */
-    function removeMinterForProject(
-        uint256 _projectId
-    )
-        external
-        onlyCoreAdminACLOrArtist(
+    function removeMinterForProject(uint256 _projectId) external {
+        _onlyCoreAdminACLOrArtist(
             _projectId,
             this.removeMinterForProject.selector
-        )
-    {
+        );
         _removeMinterForProject(_projectId);
     }
 
@@ -228,9 +217,8 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @dev requires all project IDs to have an assigned minter
      * @dev caution with respect to single tx gas limits
      */
-    function removeMintersForProjects(
-        uint256[] calldata _projectIds
-    ) external onlyCoreAdminACL(this.removeMintersForProjects.selector) {
+    function removeMintersForProjects(uint256[] calldata _projectIds) external {
+        _onlyCoreAdminACL(this.removeMintersForProjects.selector);
         uint256 numProjects = _projectIds.length;
         for (uint256 i; i < numProjects; i++) {
             _removeMinterForProject(_projectIds[i]);
@@ -283,7 +271,8 @@ contract MinterFilterV1 is IMinterFilterV0 {
      */
     function getMinterForProject(
         uint256 _projectId
-    ) external view onlyValidProjectId(_projectId) returns (address) {
+    ) external view returns (address) {
+        _onlyValidProjectId(_projectId);
         (bool _hasMinter, address _currentMinter) = minterForProject.tryGet(
             _projectId
         );
@@ -296,9 +285,8 @@ contract MinterFilterV1 is IMinterFilterV0 {
      * @param _projectId Project ID to query.
      * @return bool true if project has an assigned minter, else false
      */
-    function projectHasMinter(
-        uint256 _projectId
-    ) external view onlyValidProjectId(_projectId) returns (bool) {
+    function projectHasMinter(uint256 _projectId) external view returns (bool) {
+        _onlyValidProjectId(_projectId);
         (bool _hasMinter, ) = minterForProject.tryGet(_projectId);
         return _hasMinter;
     }

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

@@ -144,8 +144,11 @@ contract MinterDAExpSettlementV2 is
     /// user address => project ID => receipt
     mapping(address => mapping(uint256 => Receipt)) receipts;
 
-    // modifier to restrict access to only AdminACL or the artist
-    modifier onlyCoreAdminACLOrArtist(uint256 _projectId, bytes4 _selector) {
+    // function to restrict access to only AdminACL or the artist
+    function _onlyCoreAdminACLOrArtist(
+        uint256 _projectId,
+        bytes4 _selector
+    ) internal {
         require(
             (msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId)) ||
@@ -158,12 +161,11 @@ contract MinterDAExpSettlementV2 is
                 ),
             "Only Artist or Admin ACL"
         );
-        _;
     }
 
-    // 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_Base.adminACLAllowed(
                 msg.sender,
@@ -172,16 +174,14 @@ contract MinterDAExpSettlementV2 is
             ),
             "Only Core AdminACL allowed"
         );
-        _;
     }
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             (msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId)),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -220,9 +220,8 @@ contract MinterDAExpSettlementV2 is
      * @param _projectId Project ID to set the maximum invocations for.
      * @dev This function is included for interface conformance purposes only.
      */
-    function setProjectMaxInvocations(
-        uint256 _projectId
-    ) external view onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) external view {
+        _onlyArtist(_projectId);
         revert("Not implemented");
     }
 
@@ -240,7 +239,8 @@ contract MinterDAExpSettlementV2 is
     function manuallyLimitProjectMaxInvocations(
         uint256 _projectId,
         uint256 _maxInvocations
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // CHECKS
         // require that new maxInvocations is greater than 0 to prevent
         // accidental premature closure of a project when artist is
@@ -288,9 +288,8 @@ contract MinterDAExpSettlementV2 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");
     }
 
@@ -355,12 +354,10 @@ contract MinterDAExpSettlementV2 is
     function setAllowablePriceDecayHalfLifeRangeSeconds(
         uint256 _minimumPriceDecayHalfLifeSeconds,
         uint256 _maximumPriceDecayHalfLifeSeconds
-    )
-        external
-        onlyCoreAdminACL(
+    ) external {
+        _onlyCoreAdminACL(
             this.setAllowablePriceDecayHalfLifeRangeSeconds.selector
-        )
-    {
+        );
         require(
             _maximumPriceDecayHalfLifeSeconds >
                 _minimumPriceDecayHalfLifeSeconds,
@@ -410,7 +407,8 @@ contract MinterDAExpSettlementV2 is
         uint256 _priceDecayHalfLifeSeconds,
         uint256 _startPrice,
         uint256 _basePrice
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // CHECKS
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         require(
@@ -485,9 +483,8 @@ contract MinterDAExpSettlementV2 is
      * surpass (payments - excess_settlement_funds) for a given project.
      * @param _projectId Project ID to set auction details for.
      */
-    function resetAuctionDetails(
-        uint256 _projectId
-    ) external onlyCoreAdminACL(this.resetAuctionDetails.selector) {
+    function resetAuctionDetails(uint256 _projectId) external {
+        _onlyCoreAdminACL(this.resetAuctionDetails.selector);
         // CHECKS
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         require(_projectConfig.startPrice != 0, "Auction must be configured");
@@ -527,10 +524,8 @@ contract MinterDAExpSettlementV2 is
     function adminEmergencyReduceSelloutPrice(
         uint256 _projectId,
         uint256 _newSelloutPrice
-    )
-        external
-        onlyCoreAdminACL(this.adminEmergencyReduceSelloutPrice.selector)
-    {
+    ) external {
+        _onlyCoreAdminACL(this.adminEmergencyReduceSelloutPrice.selector);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         require(
             !_projectConfig.auctionRevenuesCollected,
@@ -576,14 +571,11 @@ contract MinterDAExpSettlementV2 is
      */
     function withdrawArtistAndAdminRevenues(
         uint256 _projectId
-    )
-        external
-        nonReentrant
-        onlyCoreAdminACLOrArtist(
+    ) external nonReentrant {
+        _onlyCoreAdminACLOrArtist(
             _projectId,
             this.withdrawArtistAndAdminRevenues.selector
-        )
-    {
+        );
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         // CHECKS
         // require revenues to not have already been collected

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

@@ -91,9 +91,9 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
     /// more than this amount (may cut in half at no more than every N seconds).
     uint256 public maximumPriceDecayHalfLifeSeconds = 3600; // 60 minutes
 
-    // 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_Base.adminACLAllowed(
                 msg.sender,
@@ -102,16 +102,14 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
             ),
             "Only Core AdminACL allowed"
         );
-        _;
     }
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             (msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId)),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -148,9 +146,8 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
      * @dev this enables gas reduction after maxInvocations have been reached -
      * core contracts shall still enforce a maxInvocation check during mint.
      */
-    function setProjectMaxInvocations(
-        uint256 _projectId
-    ) public onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -183,7 +180,8 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
     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;
@@ -213,9 +211,8 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
      * @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");
     }
 
@@ -298,12 +295,10 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
     function setAllowablePriceDecayHalfLifeRangeSeconds(
         uint256 _minimumPriceDecayHalfLifeSeconds,
         uint256 _maximumPriceDecayHalfLifeSeconds
-    )
-        external
-        onlyCoreAdminACL(
+    ) external {
+        _onlyCoreAdminACL(
             this.setAllowablePriceDecayHalfLifeRangeSeconds.selector
-        )
-    {
+        );
         require(
             _maximumPriceDecayHalfLifeSeconds >
                 _minimumPriceDecayHalfLifeSeconds,
@@ -339,7 +334,8 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
         uint256 _priceDecayHalfLifeSeconds,
         uint256 _startPrice,
         uint256 _basePrice
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // CHECKS
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         require(
@@ -393,9 +389,8 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
      * operation, but rather only in case of the need to halt an auction.
      * @param _projectId Project ID to set auction details for.
      */
-    function resetAuctionDetails(
-        uint256 _projectId
-    ) external onlyCoreAdminACL(this.resetAuctionDetails.selector) {
+    function resetAuctionDetails(uint256 _projectId) external {
+        _onlyCoreAdminACL(this.resetAuctionDetails.selector);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         // reset to initial values
         _projectConfig.timestampStart = 0;

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

@@ -87,9 +87,9 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
     /// Minimum auction length in seconds
     uint256 public minimumAuctionLengthSeconds = 3600;
 
-    // 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_Base.adminACLAllowed(
                 msg.sender,
@@ -98,16 +98,14 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
             ),
             "Only Core AdminACL allowed"
         );
-        _;
     }
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             (msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId)),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -144,9 +142,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
      * @dev this enables gas reduction after maxInvocations have been reached -
      * core contracts shall still enforce a maxInvocation check during mint.
      */
-    function setProjectMaxInvocations(
-        uint256 _projectId
-    ) public onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -178,7 +175,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
     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;
@@ -207,9 +205,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
      * @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");
     }
 
@@ -287,7 +284,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
      */
     function setMinimumAuctionLengthSeconds(
         uint256 _minimumAuctionLengthSeconds
-    ) external onlyCoreAdminACL(this.setMinimumAuctionLengthSeconds.selector) {
+    ) external {
+        _onlyCoreAdminACL(this.setMinimumAuctionLengthSeconds.selector);
         minimumAuctionLengthSeconds = _minimumAuctionLengthSeconds;
         emit MinimumAuctionLengthSecondsUpdated(_minimumAuctionLengthSeconds);
     }
@@ -309,7 +307,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
         uint256 _auctionTimestampEnd,
         uint256 _startPrice,
         uint256 _basePrice
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         // CHECKS
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         require(
@@ -364,9 +363,8 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
      * operation, but rather only in case of the need to halt an auction.
      * @param _projectId Project ID to set auction details for.
      */
-    function resetAuctionDetails(
-        uint256 _projectId
-    ) external onlyCoreAdminACL(this.resetAuctionDetails.selector) {
+    function resetAuctionDetails(uint256 _projectId) external {
+        _onlyCoreAdminACL(this.resetAuctionDetails.selector);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         // reset to initial values
         _projectConfig.timestampStart = 0;

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

@@ -113,9 +113,9 @@ contract MinterHolderV4 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_Base.adminACLAllowed(
                 msg.sender,
@@ -124,16 +124,14 @@ contract MinterHolderV4 is
             ),
             "Only Core AdminACL allowed"
         );
-        _;
     }
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -177,9 +175,8 @@ contract MinterHolderV4 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);
         _registeredNFTAddresses.add(_NFTAddress);
         emit RegisteredNFTAddress(_NFTAddress);
     }
@@ -190,9 +187,8 @@ contract MinterHolderV4 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);
     }
@@ -214,7 +210,8 @@ contract MinterHolderV4 is
         uint256 _projectId,
         address[] memory _ownedNFTAddresses,
         uint256[] memory _ownedNFTProjectIds
-    ) public onlyArtist(_projectId) {
+    ) public {
+        _onlyArtist(_projectId);
         // require same length arrays
         require(
             _ownedNFTAddresses.length == _ownedNFTProjectIds.length,
@@ -259,7 +256,8 @@ contract MinterHolderV4 is
         uint256 _projectId,
         address[] memory _ownedNFTAddresses,
         uint256[] memory _ownedNFTProjectIds
-    ) public onlyArtist(_projectId) {
+    ) public {
+        _onlyArtist(_projectId);
         // require same length arrays
         require(
             _ownedNFTAddresses.length == _ownedNFTProjectIds.length,
@@ -314,7 +312,8 @@ contract MinterHolderV4 is
         uint256[] memory _ownedNFTProjectIdsAdd,
         address[] memory _ownedNFTAddressesRemove,
         uint256[] memory _ownedNFTProjectIdsRemove
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         allowHoldersOfProjects(
             _projectId,
             _ownedNFTAddressesAdd,
@@ -387,7 +386,8 @@ contract MinterHolderV4 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;
@@ -418,9 +418,8 @@ contract MinterHolderV4 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");
     }
 
@@ -477,7 +476,8 @@ contract MinterHolderV4 is
     function updatePricePerTokenInWei(
         uint256 _projectId,
         uint256 _pricePerTokenInWei
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         _projectConfig.pricePerTokenInWei = _pricePerTokenInWei;
         _projectConfig.priceIsConfigured = true;