@artblocks/contracts 1.0.0 → 1.0.2

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

@@ -67,6 +67,9 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
     /// minterType for this minter
     string public constant minterType = "MinterDAExpV4";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v4.1.0";
+
     uint256 constant ONE_MILLION = 1_000_000;
 
     struct ProjectConfig {
@@ -88,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,
@@ -99,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"
         );
-        _;
     }
 
     /**
@@ -145,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
-    ) external onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -180,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;
@@ -210,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");
     }
 
@@ -295,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,
@@ -336,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(
@@ -372,6 +371,16 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
             _startPrice,
             _basePrice
         );
+
+        // sync local max invocations if not initially populated
+        // @dev if local max invocations and maxHasBeenInvoked are both
+        // initial values, we know they have not been populated.
+        if (
+            _projectConfig.maxInvocations == 0 &&
+            _projectConfig.maxHasBeenInvoked == false
+        ) {
+            setProjectMaxInvocations(_projectId);
+        }
     }
 
     /**
@@ -380,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;
@@ -460,10 +468,25 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
         // EFFECTS
         tokenId = minterFilter.mint(_to, _projectId, msg.sender);
 
-        // okay if this underflows because if statement will always eval false.
-        // this is only for gas optimization (core enforces maxInvocations).
+        // invocation is token number plus one, and will never overflow due to
+        // limit of 1e6 invocations per project. block scope for gas efficiency
+        // (i.e. avoid an unnecessary var initialization to 0).
         unchecked {
-            if (tokenId % ONE_MILLION == _projectConfig.maxInvocations - 1) {
+            uint256 tokenInvocation = (tokenId % ONE_MILLION) + 1;
+            uint256 localMaxInvocations = _projectConfig.maxInvocations;
+            // handle the case where the token invocation == minter local max
+            // invocations occurred on a different minter, and we have a stale
+            // local maxHasBeenInvoked value returning a false negative.
+            // @dev this is a CHECK after EFFECTS, so security was considered
+            // in detail here.
+            require(
+                tokenInvocation <= localMaxInvocations,
+                "Maximum invocations reached"
+            );
+            // in typical case, update the local maxHasBeenInvoked value
+            // to true if the token invocation == minter local max invocations
+            // (enables gas efficient reverts after sellout)
+            if (tokenInvocation == localMaxInvocations) {
                 _projectConfig.maxHasBeenInvoked = true;
             }
         }

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

@@ -67,6 +67,9 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
     /// minterType for this minter
     string public constant minterType = "MinterDALinV4";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v4.1.0";
+
     uint256 constant ONE_MILLION = 1_000_000;
 
     struct ProjectConfig {
@@ -84,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,
@@ -95,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"
         );
-        _;
     }
 
     /**
@@ -141,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
-    ) external onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -175,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;
@@ -204,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");
     }
 
@@ -284,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);
     }
@@ -306,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(
@@ -343,6 +345,16 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
             _startPrice,
             _basePrice
         );
+
+        // sync local max invocations if not initially populated
+        // @dev if local max invocations and maxHasBeenInvoked are both
+        // initial values, we know they have not been populated.
+        if (
+            _projectConfig.maxInvocations == 0 &&
+            _projectConfig.maxHasBeenInvoked == false
+        ) {
+            setProjectMaxInvocations(_projectId);
+        }
     }
 
     /**
@@ -351,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;
@@ -430,11 +441,25 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
 
         // EFFECTS
         tokenId = minterFilter.mint(_to, _projectId, msg.sender);
-
-        // okay if this underflows because if statement will always eval false.
-        // this is only for gas optimization (core enforces maxInvocations).
+        // invocation is token number plus one, and will never overflow due to
+        // limit of 1e6 invocations per project. block scope for gas efficiency
+        // (i.e. avoid an unnecessary var initialization to 0).
         unchecked {
-            if (tokenId % ONE_MILLION == _projectConfig.maxInvocations - 1) {
+            uint256 tokenInvocation = (tokenId % ONE_MILLION) + 1;
+            uint256 localMaxInvocations = _projectConfig.maxInvocations;
+            // handle the case where the token invocation == minter local max
+            // invocations occurred on a different minter, and we have a stale
+            // local maxHasBeenInvoked value returning a false negative.
+            // @dev this is a CHECK after EFFECTS, so security was considered
+            // in detail here.
+            require(
+                tokenInvocation <= localMaxInvocations,
+                "Maximum invocations reached"
+            );
+            // in typical case, update the local maxHasBeenInvoked value
+            // to true if the token invocation == minter local max invocations
+            // (enables gas efficient reverts after sellout)
+            if (tokenInvocation == localMaxInvocations) {
                 _projectConfig.maxHasBeenInvoked = true;
             }
         }

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

@@ -89,6 +89,9 @@ contract MinterHolderV4 is
     /// minterType for this minter
     string public constant minterType = "MinterHolderV4";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v4.1.0";
+
     uint256 constant ONE_MILLION = 1_000_000;
 
     struct ProjectConfig {
@@ -110,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,
@@ -121,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"
         );
-        _;
     }
 
     /**
@@ -174,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);
     }
@@ -187,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);
     }
@@ -211,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,
@@ -256,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,
@@ -311,7 +312,8 @@ contract MinterHolderV4 is
         uint256[] memory _ownedNFTProjectIdsAdd,
         address[] memory _ownedNFTAddressesRemove,
         uint256[] memory _ownedNFTProjectIdsRemove
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         allowHoldersOfProjects(
             _projectId,
             _ownedNFTAddressesAdd,
@@ -352,7 +354,7 @@ contract MinterHolderV4 is
      * @dev this enables gas reduction after maxInvocations have been reached -
      * core contracts shall still enforce a maxInvocation check during mint.
      */
-    function setProjectMaxInvocations(uint256 _projectId) external {
+    function setProjectMaxInvocations(uint256 _projectId) public {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -384,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;
@@ -415,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");
     }
 
@@ -474,10 +476,22 @@ contract MinterHolderV4 is
     function updatePricePerTokenInWei(
         uint256 _projectId,
         uint256 _pricePerTokenInWei
-    ) external onlyArtist(_projectId) {
-        projectConfig[_projectId].pricePerTokenInWei = _pricePerTokenInWei;
-        projectConfig[_projectId].priceIsConfigured = true;
+    ) external {
+        _onlyArtist(_projectId);
+        ProjectConfig storage _projectConfig = projectConfig[_projectId];
+        _projectConfig.pricePerTokenInWei = _pricePerTokenInWei;
+        _projectConfig.priceIsConfigured = true;
         emit PricePerTokenInWeiUpdated(_projectId, _pricePerTokenInWei);
+
+        // sync local max invocations if not initially populated
+        // @dev if local max invocations and maxHasBeenInvoked are both
+        // initial values, we know they have not been populated.
+        if (
+            _projectConfig.maxInvocations == 0 &&
+            _projectConfig.maxHasBeenInvoked == false
+        ) {
+            setProjectMaxInvocations(_projectId);
+        }
     }
 
     /**
@@ -669,10 +683,25 @@ contract MinterHolderV4 is
 
         // NOTE: delegate-vault handling **ends here**.
 
-        // okay if this underflows because if statement will always eval false.
-        // this is only for gas optimization (core enforces maxInvocations).
+        // invocation is token number plus one, and will never overflow due to
+        // limit of 1e6 invocations per project. block scope for gas efficiency
+        // (i.e. avoid an unnecessary var initialization to 0).
         unchecked {
-            if (tokenId % ONE_MILLION == _projectConfig.maxInvocations - 1) {
+            uint256 tokenInvocation = (tokenId % ONE_MILLION) + 1;
+            uint256 localMaxInvocations = _projectConfig.maxInvocations;
+            // handle the case where the token invocation == minter local max
+            // invocations occurred on a different minter, and we have a stale
+            // local maxHasBeenInvoked value returning a false negative.
+            // @dev this is a CHECK after EFFECTS, so security was considered
+            // in detail here.
+            require(
+                tokenInvocation <= localMaxInvocations,
+                "Maximum invocations reached"
+            );
+            // in typical case, update the local maxHasBeenInvoked value
+            // to true if the token invocation == minter local max invocations
+            // (enables gas efficient reverts after sellout)
+            if (tokenInvocation == localMaxInvocations) {
                 _projectConfig.maxHasBeenInvoked = true;
             }
         }

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

@@ -79,6 +79,9 @@ contract MinterMerkleV5 is
     /// minterType for this minter
     string public constant minterType = "MinterMerkleV5";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v5.1.0";
+
     /// project minter configuration keys used by this minter
     bytes32 private constant CONFIG_MERKLE_ROOT = "merkleRoot";
     bytes32 private constant CONFIG_USE_MAX_INVOCATIONS_PER_ADDRESS_OVERRIDE =
@@ -112,13 +115,12 @@ contract MinterMerkleV5 is
     mapping(uint256 => mapping(address => uint256))
         public projectUserMintInvocations;
 
-    modifier onlyArtist(uint256 _projectId) {
+    function _onlyArtist(uint256 _projectId) internal view {
         require(
             msg.sender ==
                 genArtCoreContract_Base.projectIdToArtistAddress(_projectId),
             "Only Artist"
         );
-        _;
     }
 
     /**
@@ -166,10 +168,8 @@ contract MinterMerkleV5 is
      * @param _root root of Merkle tree defining addresses allowed to mint
      * on project `_projectId`.
      */
-    function updateMerkleRoot(
-        uint256 _projectId,
-        bytes32 _root
-    ) external onlyArtist(_projectId) {
+    function updateMerkleRoot(uint256 _projectId, bytes32 _root) external {
+        _onlyArtist(_projectId);
         require(_root != bytes32(0), "Root must be provided");
         projectMerkleRoot[_projectId] = _root;
         emit ConfigValueSet(_projectId, CONFIG_MERKLE_ROOT, _root);
@@ -221,7 +221,8 @@ contract MinterMerkleV5 is
     function setProjectInvocationsPerAddress(
         uint256 _projectId,
         uint24 _maxInvocationsPerAddress
-    ) external onlyArtist(_projectId) {
+    ) external {
+        _onlyArtist(_projectId);
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
         // use override value instead of the contract's default
         // @dev this never changes from true to false; default value is only
@@ -250,9 +251,8 @@ contract MinterMerkleV5 is
      * @dev this enables gas reduction after maxInvocations have been reached -
      * core contracts shall still enforce a maxInvocation check during mint.
      */
-    function setProjectMaxInvocations(
-        uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    function setProjectMaxInvocations(uint256 _projectId) public {
+        _onlyArtist(_projectId);
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -284,7 +284,8 @@ contract MinterMerkleV5 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;
@@ -315,9 +316,8 @@ contract MinterMerkleV5 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");
     }
 
@@ -374,10 +374,22 @@ contract MinterMerkleV5 is
     function updatePricePerTokenInWei(
         uint256 _projectId,
         uint256 _pricePerTokenInWei
-    ) external onlyArtist(_projectId) {
-        projectConfig[_projectId].pricePerTokenInWei = _pricePerTokenInWei;
-        projectConfig[_projectId].priceIsConfigured = true;
+    ) external {
+        _onlyArtist(_projectId);
+        ProjectConfig storage _projectConfig = projectConfig[_projectId];
+        _projectConfig.pricePerTokenInWei = _pricePerTokenInWei;
+        _projectConfig.priceIsConfigured = true;
         emit PricePerTokenInWeiUpdated(_projectId, _pricePerTokenInWei);
+
+        // sync local max invocations if not initially populated
+        // @dev if local max invocations and maxHasBeenInvoked are both
+        // initial values, we know they have not been populated.
+        if (
+            _projectConfig.maxInvocations == 0 &&
+            _projectConfig.maxHasBeenInvoked == false
+        ) {
+            setProjectMaxInvocations(_projectId);
+        }
     }
 
     /**
@@ -551,10 +563,25 @@ contract MinterMerkleV5 is
 
         // NOTE: delegate-vault handling **ends here**.
 
-        // okay if this underflows because if statement will always eval false.
-        // this is only for gas optimization (core enforces maxInvocations).
+        // invocation is token number plus one, and will never overflow due to
+        // limit of 1e6 invocations per project. block scope for gas efficiency
+        // (i.e. avoid an unnecessary var initialization to 0).
         unchecked {
-            if (tokenId % ONE_MILLION == _projectConfig.maxInvocations - 1) {
+            uint256 tokenInvocation = (tokenId % ONE_MILLION) + 1;
+            uint256 localMaxInvocations = _projectConfig.maxInvocations;
+            // handle the case where the token invocation == minter local max
+            // invocations occurred on a different minter, and we have a stale
+            // local maxHasBeenInvoked value returning a false negative.
+            // @dev this is a CHECK after EFFECTS, so security was considered
+            // in detail here.
+            require(
+                tokenInvocation <= localMaxInvocations,
+                "Maximum invocations reached"
+            );
+            // in typical case, update the local maxHasBeenInvoked value
+            // to true if the token invocation == minter local max invocations
+            // (enables gas efficient reverts after sellout)
+            if (tokenInvocation == localMaxInvocations) {
                 _projectConfig.maxHasBeenInvoked = true;
             }
         }