@artblocks/contracts 1.1.0 → 1.2.1

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 {

package/contracts/engine/V2/GenArt721MinterBurner_PBAB.sol

@@ -215,18 +215,46 @@ contract GenArt721MinterBurner_PBAB is ReentrancyGuard {
     }
 
     /**
-     * @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
     ) public payable returns (uint256 _tokenId) {
-        return purchaseTo(msg.sender, _projectId);
+        // pass max price as msg.value, currency address as ETH
+        return
+            purchaseTo({
+                _to: msg.sender,
+                _projectId: _projectId,
+                _maxPricePerToken: msg.value,
+                _currencyAddress: address(0)
+            });
     }
 
     /**
-     * @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
+    ) public payable returns (uint256 _tokenId) {
+        return
+            purchaseTo({
+                _to: msg.sender,
+                _projectId: _projectId,
+                _maxPricePerToken: _maxPricePerToken,
+                _currencyAddress: _currencyAddress
+            });
+    }
+
+    /**
+     * @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.
@@ -235,6 +263,31 @@ contract GenArt721MinterBurner_PBAB is ReentrancyGuard {
     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(
@@ -246,6 +299,21 @@ contract GenArt721MinterBurner_PBAB is ReentrancyGuard {
             require(msg.sender == tx.origin, "No Contract Buys");
         }
 
+        uint256 pricePerTokenInWei = genArtCoreContract
+            .projectIdToPricePerTokenInWei(_projectId);
+        address configuredCurrencyAddress = genArtCoreContract
+            .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");
+        }
+
         // limit mints per address by project
         if (projectMintLimit[_projectId] > 0) {
             require(
@@ -283,13 +351,13 @@ contract GenArt721MinterBurner_PBAB is ReentrancyGuard {
         }
 
         // validate and split funds
-        if (
-            keccak256(
-                abi.encodePacked(
-                    genArtCoreContract.projectIdToCurrencySymbol(_projectId)
-                )
-            ) != keccak256(abi.encodePacked("ETH"))
-        ) {
+        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"
@@ -297,28 +365,19 @@ contract GenArt721MinterBurner_PBAB is ReentrancyGuard {
             require(
                 IERC20(
                     genArtCoreContract.projectIdToCurrencyAddress(_projectId)
-                ).allowance(msg.sender, address(this)) >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                ).allowance(msg.sender, address(this)) >= pricePerTokenInWei,
                 "Insufficient Funds Approved for TX"
             );
             require(
                 IERC20(
                     genArtCoreContract.projectIdToCurrencyAddress(_projectId)
-                ).balanceOf(msg.sender) >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                ).balanceOf(msg.sender) >= pricePerTokenInWei,
                 "Insufficient balance."
             );
             _splitFundsERC20(_projectId);
         } else {
             require(
-                msg.value >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                msg.value >= pricePerTokenInWei,
                 "Must send minimum value to mint!"
             );
             _splitFundsETH(_projectId);

package/contracts/engine/V2/GenArt721Minter_PBAB.sol

@@ -176,18 +176,49 @@ contract GenArt721Minter_PBAB is ReentrancyGuard {
     }
 
     /**
-     * @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
     ) public payable returns (uint256 _tokenId) {
-        return purchaseTo(msg.sender, _projectId);
+        // pass currency address as ETH
+        address _currencyAddress = address(0);
+        uint256 _maxPricePerToken = msg.value;
+
+        return
+            purchaseTo(
+                msg.sender,
+                _projectId,
+                _maxPricePerToken,
+                _currencyAddress
+            );
     }
 
     /**
-     * @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
+    ) public payable returns (uint256 _tokenId) {
+        return
+            purchaseTo(
+                msg.sender,
+                _projectId,
+                _maxPricePerToken,
+                _currencyAddress
+            );
+    }
+
+    /**
+     * @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.
@@ -196,6 +227,28 @@ contract GenArt721Minter_PBAB is ReentrancyGuard {
     function purchaseTo(
         address _to,
         uint256 _projectId
+    ) public payable returns (uint256 _tokenId) {
+        // pass currency address as ETH
+        address _currencyAddress = address(0);
+        uint256 _maxPricePerToken = msg.value;
+
+        return purchaseTo(_to, _projectId, _maxPricePerToken, _currencyAddress);
+    }
+
+    /**
+     * @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(
@@ -207,6 +260,20 @@ contract GenArt721Minter_PBAB is ReentrancyGuard {
             require(msg.sender == tx.origin, "No Contract Buys");
         }
 
+        uint256 pricePerTokenInWei = genArtCoreContract
+            .projectIdToPricePerTokenInWei(_projectId);
+        address configuredCurrencyAddress = genArtCoreContract
+            .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");
+        }
         // limit mints per address by project
         if (projectMintLimit[_projectId] > 0) {
             require(
@@ -244,13 +311,13 @@ contract GenArt721Minter_PBAB is ReentrancyGuard {
         }
 
         // validate and split funds
-        if (
-            keccak256(
-                abi.encodePacked(
-                    genArtCoreContract.projectIdToCurrencySymbol(_projectId)
-                )
-            ) != keccak256(abi.encodePacked("ETH"))
-        ) {
+        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"
@@ -258,28 +325,19 @@ contract GenArt721Minter_PBAB is ReentrancyGuard {
             require(
                 IERC20(
                     genArtCoreContract.projectIdToCurrencyAddress(_projectId)
-                ).allowance(msg.sender, address(this)) >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                ).allowance(msg.sender, address(this)) >= pricePerTokenInWei,
                 "Insufficient Funds Approved for TX"
             );
             require(
                 IERC20(
                     genArtCoreContract.projectIdToCurrencyAddress(_projectId)
-                ).balanceOf(msg.sender) >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                ).balanceOf(msg.sender) >= pricePerTokenInWei,
                 "Insufficient balance."
             );
             _splitFundsERC20(_projectId);
         } else {
             require(
-                msg.value >=
-                    genArtCoreContract.projectIdToPricePerTokenInWei(
-                        _projectId
-                    ),
+                msg.value >= pricePerTokenInWei,
                 "Must send minimum value to mint!"
             );
             _splitFundsETH(_projectId);