@artblocks/contracts 1.0.4 → 1.2.0

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterSEA}/MinterSEAV0.sol

@@ -3,10 +3,10 @@
 
 pragma solidity 0.8.19;
 
-import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
-import "../../interfaces/v0.8.x/IMinterFilterV0.sol";
-import "../../interfaces/v0.8.x/IFilteredMinterSEAV0.sol";
-import "./MinterBase_v0_1_1.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterSEAV0.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.7/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin-4.7/contracts/security/ReentrancyGuard.sol";
@@ -119,23 +119,23 @@ contract MinterSEAV0 is ReentrancyGuard, MinterBase, IFilteredMinterSEAV0 {
 
     // minter-wide, admin-configurable parameters
     // ----------------------------------------
-    // minimum inital auction length, in seconds; configurable by admin
+    // minimum initial auction length, in seconds; configurable by admin
     // max uint32 ~= 4.3e9 sec ~= 136 years
     // @dev enforced only when artist configures a project
     // @dev default to 10 minutes
     uint32 minAuctionDurationSeconds = 600;
-    // maximum inital auction length, in seconds; configurable by admin
+    // maximum initial auction length, in seconds; configurable by admin
     // @dev enforced only when artist configures a project
     // @dev default to 1 month (1/12 of a year)
     uint32 maxAuctionDurationSeconds = 2_629_746;
     // the minimum percent increase for new bids above the current bid
-    // configureable by admin
+    // configurable by admin
     // max uint8 ~= 255, > 100 percent
     // @dev used when determining the increment percentage for any new bid on
     // the minter, across all projects
     uint8 minterMinBidIncrementPercentage = 5;
     // minimum time remaining in auction after a new bid is placed
-    // configureable by admin
+    // configurable by admin
     // max uint32 ~= 4.3e9 sec ~= 136 years
     // @dev used when determining the buffer time for any new bid on the
     // minter, across all projects
@@ -406,7 +406,7 @@ contract MinterSEAV0 is ReentrancyGuard, MinterBase, IFilteredMinterSEAV0 {
      * @param _projectId Project ID to set future auction details for.
      * @param _timestampStart Timestamp after which new auctions may be
      * started. Note that this is not the timestamp of the auction start, but
-     * rather the timestamp after which a auction may be started. Also note
+     * rather the timestamp after which an auction may be started. Also note
      * that the passed value here must either be in the future, or `0` (which
      * indicates that auctions are immediately startable).
      * @param _auctionDurationSeconds Duration of new auctions, in seconds,
@@ -499,7 +499,7 @@ contract MinterSEAV0 is ReentrancyGuard, MinterBase, IFilteredMinterSEAV0 {
      * has a "next token" assigned to a project, but the project has been reset
      * via `resetAuctionDetails`, and the artist does not want an auction to be
      * started for the "next token". This function also protects against the
-     * unforseen case where the minter is in an unexpected state where it has a
+     * unforeseen case where the minter is in an unexpected state where it has a
      * "next token" assigned to a project, but for some reason the project is
      * unable to begin a new auction due to a bug.
      * @dev only a single token may be actively assigned to a project's "next
@@ -541,11 +541,11 @@ contract MinterSEAV0 is ReentrancyGuard, MinterBase, IFilteredMinterSEAV0 {
 
     /**
      * @notice Emergency, Artist-only function that attempts to mint a new
-     * token and set it as the the next token to be auctioned for project
+     * token and set it as the next token to be auctioned for project
      * `_projectId`.
-     * Note: This function is only included for emergency, unforseen use cases,
+     * Note: This function is only included for emergency, unforeseen use cases,
      * and should not be used in normal operation. It is here only for
-     * redundant protection against an unforseen edge case where the minter
+     * redundant protection against an unforeseen edge case where the minter
      * does not have a populated "next token", but there are still invocations
      * remaining on the project.
      * This function reverts if the project is not configured on this minter.

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterSetPrice}/MinterSetPriceV4.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
-import "../../interfaces/v0.8.x/IMinterFilterV0.sol";
-import "../../interfaces/v0.8.x/IFilteredMinterV2.sol";
-import "./MinterBase_v0_1_1.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV2.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 

package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V0.sol

@@ -231,19 +231,46 @@ contract MinterSetPriceERC20V0 is ReentrancyGuard, IFilteredMinterV0 {
     }
 
     /**
-     * @notice Purchases a token from project `_projectId`.
+     * @notice Purchases a token from project `_projectId` with ETH.
      * @param _projectId Project ID to mint a token on.
      * @return tokenId Token ID of minted token
      */
     function purchase(
         uint256 _projectId
     ) external payable returns (uint256 tokenId) {
-        tokenId = purchaseTo(msg.sender, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: msg.value,
+            _currencyAddress: address(0)
+        });
         return tokenId;
     }
 
     /**
-     * @notice Purchases a token from project `_projectId` and sets
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
+     */
+    function purchase(
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
+    ) external payable returns (uint256 tokenId) {
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: _maxPricePerToken,
+            _currencyAddress: _currencyAddress
+        });
+        return tokenId;
+    }
+
+    /**
+     * @notice Purchases a token from project `_projectId` with ETH and sets
      * the token's owner to `_to`.
      * @param _to Address to be the new token's owner.
      * @param _projectId Project ID to mint a token on.
@@ -252,6 +279,31 @@ contract MinterSetPriceERC20V0 is ReentrancyGuard, IFilteredMinterV0 {
     function purchaseTo(
         address _to,
         uint256 _projectId
+    ) public payable returns (uint256 tokenId) {
+        // pass max price as msg.value, currency address as ETH
+        return
+            purchaseTo({
+                _to: _to,
+                _projectId: _projectId,
+                _maxPricePerToken: msg.value,
+                _currencyAddress: address(0)
+            });
+    }
+
+    /**
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token and sets
+     * the token's owner to `_to`.
+     * @param _to Address to be the new token's owner.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places. Required if currency is ERC20.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
+     */
+    function purchaseTo(
+        address _to,
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
     ) public payable nonReentrant returns (uint256 tokenId) {
         // CHECKS
         require(
@@ -265,6 +317,22 @@ contract MinterSetPriceERC20V0 is ReentrancyGuard, IFilteredMinterV0 {
             "Price not configured"
         );
 
+        uint256 pricePerTokenInWei = projectIdToPricePerTokenInWei[_projectId];
+        address configuredCurrencyAddress = projectIdToCurrencyAddress[
+            _projectId
+        ];
+
+        // validate that the currency address matches the project configured currency
+        require(
+            _currencyAddress == configuredCurrencyAddress,
+            "Currency addresses must match"
+        );
+
+        // if configured currency is ETH validate that msg.value is the same as max price per token
+        if (configuredCurrencyAddress == address(0)) {
+            require(msg.value == _maxPricePerToken, "inconsistent msg.value");
+        }
+
         // if contract filter is off, allow calls from another contract
         if (!contractMintable[_projectId]) {
             require(msg.sender == tx.origin, "No Contract Buys");
@@ -300,28 +368,32 @@ contract MinterSetPriceERC20V0 is ReentrancyGuard, IFilteredMinterV0 {
         }
 
         // INTERACTIONS
-        if (projectIdToCurrencyAddress[_projectId] != address(0)) {
+        if (configuredCurrencyAddress != address(0)) {
+            // validate that the specified maximum price is greater than or equal to the price per token
+            require(
+                _maxPricePerToken >= pricePerTokenInWei,
+                "Only max price gte token price"
+            );
             require(
                 msg.value == 0,
                 "this project accepts a different currency and cannot accept ETH"
             );
             require(
-                IERC20(projectIdToCurrencyAddress[_projectId]).allowance(
+                IERC20(configuredCurrencyAddress).allowance(
                     msg.sender,
                     address(this)
-                ) >= projectIdToPricePerTokenInWei[_projectId],
+                ) >= pricePerTokenInWei,
                 "Insufficient Funds Approved for TX"
             );
             require(
-                IERC20(projectIdToCurrencyAddress[_projectId]).balanceOf(
-                    msg.sender
-                ) >= projectIdToPricePerTokenInWei[_projectId],
+                IERC20(configuredCurrencyAddress).balanceOf(msg.sender) >=
+                    pricePerTokenInWei,
                 "Insufficient balance."
             );
             _splitFundsERC20(_projectId);
         } else {
             require(
-                msg.value >= projectIdToPricePerTokenInWei[_projectId],
+                msg.value >= pricePerTokenInWei,
                 "Must send minimum value to mint!"
             );
             _splitFundsETH(_projectId);

package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V1.sol

@@ -193,19 +193,46 @@ contract MinterSetPriceERC20V1 is ReentrancyGuard, IFilteredMinterV0 {
     }
 
     /**
-     * @notice Purchases a token from project `_projectId`.
+     * @notice Purchases a token from project `_projectId` with ETH.
      * @param _projectId Project ID to mint a token on.
      * @return tokenId Token ID of minted token
      */
     function purchase(
         uint256 _projectId
     ) external payable returns (uint256 tokenId) {
-        tokenId = purchaseTo(msg.sender, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: msg.value,
+            _currencyAddress: address(0)
+        });
         return tokenId;
     }
 
     /**
-     * @notice Purchases a token from project `_projectId` and sets
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
+     */
+    function purchase(
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
+    ) external payable returns (uint256 tokenId) {
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: _maxPricePerToken,
+            _currencyAddress: _currencyAddress
+        });
+        return tokenId;
+    }
+
+    /**
+     * @notice Purchases a token from project `_projectId` with ETH and sets
      * the token's owner to `_to`.
      * @param _to Address to be the new token's owner.
      * @param _projectId Project ID to mint a token on.
@@ -214,6 +241,31 @@ contract MinterSetPriceERC20V1 is ReentrancyGuard, IFilteredMinterV0 {
     function purchaseTo(
         address _to,
         uint256 _projectId
+    ) public payable returns (uint256 tokenId) {
+        // pass max price as msg.value, currency address as ETH
+        return
+            purchaseTo({
+                _to: _to,
+                _projectId: _projectId,
+                _maxPricePerToken: msg.value,
+                _currencyAddress: address(0)
+            });
+    }
+
+    /**
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token and sets
+     * the token's owner to `_to`.
+     * @param _to Address to be the new token's owner.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places. Required if currency is ERC20.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
+     */
+    function purchaseTo(
+        address _to,
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
     ) public payable nonReentrant returns (uint256 tokenId) {
         // CHECKS
         require(
@@ -227,6 +279,22 @@ contract MinterSetPriceERC20V1 is ReentrancyGuard, IFilteredMinterV0 {
             "Price not configured"
         );
 
+        uint256 pricePerTokenInWei = projectIdToPricePerTokenInWei[_projectId];
+        address configuredCurrencyAddress = projectIdToCurrencyAddress[
+            _projectId
+        ];
+
+        // validate that the currency address matches the project configured currency
+        require(
+            _currencyAddress == configuredCurrencyAddress,
+            "Currency addresses must match"
+        );
+
+        // if configured currency is ETH validate that msg.value is the same as max price per token
+        if (configuredCurrencyAddress == address(0)) {
+            require(msg.value == _maxPricePerToken, "inconsistent msg.value");
+        }
+
         // EFFECTS
         tokenId = minterFilter.mint(_to, _projectId, msg.sender);
         // what if projectMaxInvocations[_projectId] is 0 (default value)?
@@ -241,28 +309,32 @@ contract MinterSetPriceERC20V1 is ReentrancyGuard, IFilteredMinterV0 {
         }
 
         // INTERACTIONS
-        if (projectIdToCurrencyAddress[_projectId] != address(0)) {
+        if (configuredCurrencyAddress != address(0)) {
+            // validate that the specified maximum price is greater than or equal to the price per token
+            require(
+                _maxPricePerToken >= pricePerTokenInWei,
+                "Only max price gte token price"
+            );
             require(
                 msg.value == 0,
                 "this project accepts a different currency and cannot accept ETH"
             );
             require(
-                IERC20(projectIdToCurrencyAddress[_projectId]).allowance(
+                IERC20(configuredCurrencyAddress).allowance(
                     msg.sender,
                     address(this)
-                ) >= projectIdToPricePerTokenInWei[_projectId],
+                ) >= pricePerTokenInWei,
                 "Insufficient Funds Approved for TX"
             );
             require(
-                IERC20(projectIdToCurrencyAddress[_projectId]).balanceOf(
-                    msg.sender
-                ) >= projectIdToPricePerTokenInWei[_projectId],
+                IERC20(configuredCurrencyAddress).balanceOf(msg.sender) >=
+                    pricePerTokenInWei,
                 "Insufficient balance."
             );
             _splitFundsERC20(_projectId);
         } else {
             require(
-                msg.value >= projectIdToPricePerTokenInWei[_projectId],
+                msg.value >= pricePerTokenInWei,
                 "Must send minimum value to mint!"
             );
             _splitFundsETH(_projectId);

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterSetPriceERC20}/MinterSetPriceERC20V4.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
-import "../../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
-import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine.sol";
-import "../../interfaces/v0.8.x/IMinterFilterV0.sol";
-import "../../interfaces/v0.8.x/IFilteredMinterV2.sol";
-import "./MinterBase_v0_1_1.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV2.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 
@@ -320,14 +320,41 @@ contract MinterSetPriceERC20V4 is
     }
 
     /**
-     * @notice Purchases a token from project `_projectId`.
+     * @notice Purchases a token from project `_projectId` with ETH.
      * @param _projectId Project ID to mint a token on.
      * @return tokenId Token ID of minted token
      */
     function purchase(
         uint256 _projectId
     ) external payable returns (uint256 tokenId) {
-        tokenId = purchaseTo_do6(msg.sender, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: msg.value,
+            _currencyAddress: address(0)
+        });
+        return tokenId;
+    }
+
+    /**
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
+     */
+    function purchase(
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
+    ) external payable returns (uint256 tokenId) {
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: _maxPricePerToken,
+            _currencyAddress: _currencyAddress
+        });
         return tokenId;
     }
 
@@ -337,12 +364,18 @@ contract MinterSetPriceERC20V4 is
     function purchase_H4M(
         uint256 _projectId
     ) external payable returns (uint256 tokenId) {
-        tokenId = purchaseTo_do6(msg.sender, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        tokenId = purchaseTo({
+            _to: msg.sender,
+            _projectId: _projectId,
+            _maxPricePerToken: msg.value,
+            _currencyAddress: address(0)
+        });
         return tokenId;
     }
 
     /**
-     * @notice Purchases a token from project `_projectId` and sets
+     * @notice Purchases a token from project `_projectId` with ETH and sets
      * the token's owner to `_to`.
      * @param _to Address to be the new token's owner.
      * @param _projectId Project ID to mint a token on.
@@ -352,15 +385,30 @@ contract MinterSetPriceERC20V4 is
         address _to,
         uint256 _projectId
     ) external payable returns (uint256 tokenId) {
-        return purchaseTo_do6(_to, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        return
+            purchaseTo({
+                _to: _to,
+                _projectId: _projectId,
+                _maxPricePerToken: msg.value,
+                _currencyAddress: address(0)
+            });
     }
 
     /**
-     * @notice gas-optimized version of purchaseTo(address, uint256).
+     * @notice Purchases a token from project `_projectId` with ETH or any ERC-20 token and sets
+     * the token's owner to `_to`.
+     * @param _to Address to be the new token's owner.
+     * @param _projectId Project ID to mint a token on.
+     * @param _maxPricePerToken Maximum price of token being allowed by the purchaser, no decimal places. Required if currency is ERC20.
+     * @param _currencyAddress Currency address of token. `address(0)` if minting with ETH.
+     * @return tokenId Token ID of minted token
      */
-    function purchaseTo_do6(
+    function purchaseTo(
         address _to,
-        uint256 _projectId
+        uint256 _projectId,
+        uint256 _maxPricePerToken,
+        address _currencyAddress
     ) public payable nonReentrant returns (uint256 tokenId) {
         // CHECKS
         ProjectConfig storage _projectConfig = projectConfig[_projectId];
@@ -379,6 +427,20 @@ contract MinterSetPriceERC20V4 is
         // require artist to have configured price of token on this minter
         require(_projectConfig.priceIsConfigured, "Price not configured");
 
+        uint256 pricePerTokenInWei = _projectConfig.pricePerTokenInWei;
+        address configuredCurrencyAddress = _projectConfig.currencyAddress;
+
+        // validate that the currency address matches the project configured currency
+        require(
+            _currencyAddress == configuredCurrencyAddress,
+            "Currency addresses must match"
+        );
+
+        // if configured currency is ETH validate that msg.value is the same as max price per token
+        if (configuredCurrencyAddress == address(0)) {
+            require(msg.value == _maxPricePerToken, "inconsistent msg.value");
+        }
+
         // EFFECTS
         tokenId = minterFilter.mint(_to, _projectId, msg.sender);
 
@@ -406,27 +468,32 @@ contract MinterSetPriceERC20V4 is
         }
 
         // INTERACTIONS
-        uint256 pricePerTokenInWei = _projectConfig.pricePerTokenInWei;
-        address _currencyAddress = _projectConfig.currencyAddress;
-        if (_currencyAddress != address(0)) {
+        if (configuredCurrencyAddress != address(0)) {
+            // validate that the specified maximum price is greater than or equal to the price per token
+            require(
+                _maxPricePerToken >= pricePerTokenInWei,
+                "Only max price gte token price"
+            );
             require(
                 msg.value == 0,
                 "this project accepts a different currency and cannot accept ETH"
             );
             require(
-                IERC20(_currencyAddress).allowance(msg.sender, address(this)) >=
-                    pricePerTokenInWei,
+                IERC20(configuredCurrencyAddress).allowance(
+                    msg.sender,
+                    address(this)
+                ) >= pricePerTokenInWei,
                 "Insufficient Funds Approved for TX"
             );
             require(
-                IERC20(_currencyAddress).balanceOf(msg.sender) >=
+                IERC20(configuredCurrencyAddress).balanceOf(msg.sender) >=
                     pricePerTokenInWei,
                 "Insufficient balance."
             );
             splitFundsERC20(
                 _projectId,
                 pricePerTokenInWei,
-                _currencyAddress,
+                configuredCurrencyAddress,
                 genArt721CoreAddress
             );
         } else {