@artblocks/contracts 1.0.0 → 1.0.1

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 {
@@ -147,7 +150,7 @@ contract MinterDAExpV4 is ReentrancyGuard, MinterBase, IFilteredMinterDAExpV1 {
      */
     function setProjectMaxInvocations(
         uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    ) public onlyArtist(_projectId) {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -372,6 +375,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);
+        }
     }
 
     /**
@@ -460,10 +473,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 {
@@ -143,7 +146,7 @@ contract MinterDALinV4 is ReentrancyGuard, MinterBase, IFilteredMinterDALinV1 {
      */
     function setProjectMaxInvocations(
         uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    ) public onlyArtist(_projectId) {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -343,6 +346,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);
+        }
     }
 
     /**
@@ -430,11 +443,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 {
@@ -352,7 +355,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
@@ -475,9 +478,20 @@ contract MinterHolderV4 is
         uint256 _projectId,
         uint256 _pricePerTokenInWei
     ) external onlyArtist(_projectId) {
-        projectConfig[_projectId].pricePerTokenInWei = _pricePerTokenInWei;
-        projectConfig[_projectId].priceIsConfigured = true;
+        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 =
@@ -252,7 +255,7 @@ contract MinterMerkleV5 is
      */
     function setProjectMaxInvocations(
         uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    ) public onlyArtist(_projectId) {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -375,9 +378,20 @@ contract MinterMerkleV5 is
         uint256 _projectId,
         uint256 _pricePerTokenInWei
     ) external onlyArtist(_projectId) {
-        projectConfig[_projectId].pricePerTokenInWei = _pricePerTokenInWei;
-        projectConfig[_projectId].priceIsConfigured = true;
+        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 +565,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;
             }
         }