@artblocks/contracts 1.0.0 → 1.0.1

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

@@ -55,6 +55,9 @@ contract MinterSetPriceERC20V4 is
     /// minterType for this minter
     string public constant minterType = "MinterSetPriceERC20V4";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v4.1.0";
+
     uint256 constant ONE_MILLION = 1_000_000;
 
     struct ProjectConfig {
@@ -150,7 +153,7 @@ contract MinterSetPriceERC20V4 is
      */
     function setProjectMaxInvocations(
         uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    ) public onlyArtist(_projectId) {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -272,9 +275,20 @@ contract MinterSetPriceERC20V4 is
         uint256 _pricePerTokenInWei
     ) external onlyArtist(_projectId) {
         require(_pricePerTokenInWei > 0, "Price may not be 0");
-        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);
+        }
     }
 
     /**
@@ -368,10 +382,25 @@ contract MinterSetPriceERC20V4 is
         // 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/MinterSetPriceV4.sol

@@ -47,6 +47,9 @@ contract MinterSetPriceV4 is ReentrancyGuard, MinterBase, IFilteredMinterV2 {
     /// minterType for this minter
     string public constant minterType = "MinterSetPriceV4";
 
+    /// minter version for this minter
+    string public constant minterVersion = "v4.1.0";
+
     uint256 constant ONE_MILLION = 1_000_000;
 
     struct ProjectConfig {
@@ -103,7 +106,7 @@ contract MinterSetPriceV4 is ReentrancyGuard, MinterBase, IFilteredMinterV2 {
      */
     function setProjectMaxInvocations(
         uint256 _projectId
-    ) external onlyArtist(_projectId) {
+    ) public onlyArtist(_projectId) {
         uint256 maxInvocations;
         uint256 invocations;
         (invocations, maxInvocations, , , , ) = genArtCoreContract_Base
@@ -230,6 +233,16 @@ contract MinterSetPriceV4 is ReentrancyGuard, MinterBase, IFilteredMinterV2 {
         _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);
+        }
     }
 
     /**
@@ -303,10 +316,25 @@ contract MinterSetPriceV4 is ReentrancyGuard, MinterBase, IFilteredMinterV2 {
         // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artblocks/contracts",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Smart contracts used by Art Blocks",
   "files": [
     "/contracts/**/*.sol",
@@ -17,7 +17,11 @@
     "coverage": "hardhat coverage",
     "format": "prettier --write 'contracts/**/*.sol' && prettier --write 'scripts/**/*.ts' && prettier --write 'test/**/*.ts'",
     "lint": "prettier --check 'contracts/**/*.sol' && prettier --check 'scripts/**/*.ts' && prettier --check 'test/**/*.ts' && npx eslint 'test/**/*.ts'",
-    "remix": "remixd -s ./ --remix-ide https://remix.ethereum.org"
+    "remix": "remixd -s ./ --remix-ide https://remix.ethereum.org",
+    "deploy:goerli:v3-engine": "yarn hardhat run --network goerli scripts/engine/V3/generic-engine-deployer.ts",
+    "deploy:mainnet:v3-engine": "yarn hardhat run --network mainnet scripts/engine/V3/generic-engine-deployer.ts",
+    "deploy:goerli:minter": "yarn hardhat run --network goerli scripts/minter-deployments/generic-minter-deployer-v3core.ts",
+    "deploy:mainnet:minter": "yarn hardhat run --network mainnet scripts/minter-deployments/generic-minter-deployer-v3core.ts"
   },
   "husky": {
     "hooks": {
@@ -46,6 +50,7 @@
     "@typechain/ethers-v5": "^6.0.5",
     "@types/jest": "^27.0.3",
     "@types/mocha": "^9.1.1",
+    "@types/prompt": "^1.1.5",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "aws-sdk-client-mock": "^0.6.2",
@@ -66,6 +71,7 @@
     "merkletreejs": "^0.2.31",
     "prettier": "^2.8.1",
     "prettier-plugin-solidity": "^1.1.1",
+    "prompt": "^1.3.0",
     "prompt-sync": "^4.2.0",
     "solidity-coverage": "^0.8.0",
     "ts-node": "^9.1.1",