@artblocks/contracts 1.1.0 → 1.2.0

package/contracts/libs/v0.8.x/minter-libs/TokenHolderLib.sol

@@ -5,6 +5,8 @@ pragma solidity ^0.8.0;
 
 import {IERC721} from "@openzeppelin-4.7/contracts/token/ERC721/IERC721.sol";
 
+import {ABHelpers} from "../ABHelpers.sol";
+
 import {EnumerableSet} from "@openzeppelin-4.5/contracts/utils/structs/EnumerableSet.sol";
 
 /**
@@ -71,9 +73,6 @@ library TokenHolderLib {
     bytes32 constant TOKEN_HOLDER_LIB_STORAGE_POSITION =
         keccak256("tokenholderlib.storage");
 
-    // Define one million to represent the base token ID for each project.
-    uint256 constant ONE_MILLION = 1_000_000;
-
     struct HolderProjectConfig {
         // projects whose holders are allowed to purchase a token on `projectId`
         mapping(address ownedNFTAddress => mapping(uint256 ownedNFTProjectId => bool allowed)) allowedProjectHolders;
@@ -253,7 +252,9 @@ library TokenHolderLib {
                 projectId: projectId,
                 coreContract: coreContract
             });
-        uint256 ownedNFTProjectId = ownedNFTTokenId / ONE_MILLION;
+        uint256 ownedNFTProjectId = ABHelpers.tokenIdToProjectId(
+            ownedNFTTokenId
+        );
         return
             holderProjectConfig.allowedProjectHolders[ownedNFTAddress][
                 ownedNFTProjectId

package/contracts/minter-suite/MinterFilter/MinterFilterV2.sol

@@ -16,6 +16,7 @@ import {Bytes32Strings} from "../../libs/v0.8.x/Bytes32Strings.sol";
 import {Ownable} from "@openzeppelin-4.7/contracts/access/Ownable.sol";
 import {EnumerableMap} from "@openzeppelin-4.7/contracts/utils/structs/EnumerableMap.sol";
 import {EnumerableSet} from "@openzeppelin-4.7/contracts/utils/structs/EnumerableSet.sol";
+import {Math} from "@openzeppelin-4.7/contracts/utils/math/Math.sol";
 
 /**
  * @title MinterFilterV2
@@ -118,8 +119,7 @@ contract MinterFilterV2 is Ownable, IMinterFilterV1 {
 
     /**
      * @notice Function to restrict access to only AdminACL allowed calls
-     * on a given core contract.
-     * @dev defers to the ACL contract used by the core contract
+     * on this minter filter's admin ACL contract.
      * @param selector function selector to be checked
      */
     function _onlyAdminACL(bytes4 selector) internal {
@@ -274,7 +274,7 @@ contract MinterFilterV2 is Ownable, IMinterFilterV1 {
      */
     function approveMinterGlobally(address minter) external {
         _onlyAdminACL(this.approveMinterGlobally.selector);
-        // @dev add() return true if the value was removed from the set
+        // @dev add() return true if the value was added to the set
         require(
             _globallyApprovedMinters.add(minter),
             "Minter already approved"
@@ -326,7 +326,7 @@ contract MinterFilterV2 is Ownable, IMinterFilterV1 {
             coreContract: coreContract,
             selector: this.approveMinterForContract.selector
         });
-        // @dev add() returns true if the value was removed from the Set
+        // @dev add() returns true if the value was added to the Set
         require(
             _contractApprovedMinters[coreContract].add(minter),
             "Minter already approved"
@@ -539,6 +539,7 @@ contract MinterFilterV2 is Ownable, IMinterFilterV1 {
         uint256 projectId,
         address coreContract
     ) external view returns (address) {
+        // @dev use tryGet to control revert message if no minter assigned
         (bool hasMinter, address currentMinter) = _minterForProject[
             coreContract
         ].tryGet(projectId);
@@ -637,16 +638,21 @@ contract MinterFilterV2 is Ownable, IMinterFilterV1 {
         address coreContract,
         address minter
     ) external view returns (uint256[] memory projectIds) {
+        EnumerableMap.UintToAddressMap storage minterMap = _minterForProject[
+            coreContract
+        ];
         // initialize arrays with maximum potential length
-        // @dev use num projects using minter across all contracts since it the
-        // maximum length of this array
-        uint256 maxNumProjects = numProjectsUsingMinter[minter];
+        // @dev use lesser of num projects using minter across all contracts
+        // and number of projects on the contract with minters assigned, since
+        // both values represent an upper bound on the number of projects that
+        // could be using the minter on the contract
+        uint256 maxNumProjects = Math.min(
+            numProjectsUsingMinter[minter],
+            minterMap.length()
+        );
         projectIds = new uint256[](maxNumProjects);
         // iterate over all projects on contract, adding to array if using
         // `minter`
-        EnumerableMap.UintToAddressMap storage minterMap = _minterForProject[
-            coreContract
-        ];
         uint256 numProjects = minterMap.length();
         uint256 numProjectsOnContractUsingMinter;
         for (uint256 i; i < numProjects; ) {

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

@@ -365,7 +365,7 @@ contract MinterDAExpHolderV5 is
                 coreContract: coreContract
             })
         ) {
-            syncProjectMaxInvocationsToCore({
+            MaxInvocationsLib.syncProjectMaxInvocationsToCore({
                 projectId: projectId,
                 coreContract: coreContract
             });
@@ -837,7 +837,7 @@ contract MinterDAExpHolderV5 is
 
         // NOTE: delegate-vault handling **ends here**.
 
-        MaxInvocationsLib.validatePurchaseEffectsInvocations({
+        MaxInvocationsLib.validateMintEffectsInvocations({
             tokenId: tokenId,
             coreContract: coreContract
         });

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

@@ -342,7 +342,7 @@ contract MinterDAExpSettlementV3 is
     /**
      * @notice Reclaims the sender's payment above current settled price for
      * project `projectId` on core contract `coreContract`.
-     * The current settled price is the the price paid for the most recently
+     * The current settled price is the price paid for the most recently
      * purchased token, or the base price if the artist has withdrawn revenues
      * after the auction reached base price.
      * This function is callable at any point, but is expected to typically be
@@ -366,7 +366,7 @@ contract MinterDAExpSettlementV3 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * projects in `projectIds`. The current settled price is the the price
+     * projects in `projectIds`. The current settled price is the price
      * paid for the most recently purchased token, or the base price if the
      * artist has withdrawn revenues after the auction reached base price.
      * This function is callable at any point, but is expected to typically be
@@ -702,7 +702,7 @@ contract MinterDAExpSettlementV3 is
     /**
      * @notice Reclaims the sender's payment above current settled price for
      * project `projectId` on core contract `coreContract`.
-     * The current settled price is the the price paid for the most recently
+     * The current settled price is the price paid for the most recently
      * purchased token, or the base price if the artist has withdrawn revenues
      * after the auction reached base price.
      * This function is callable at any point, but is expected to typically be
@@ -725,13 +725,14 @@ contract MinterDAExpSettlementV3 is
             to: to,
             projectId: projectId,
             coreContract: coreContract,
-            purchaserAddress: msg.sender
+            purchaserAddress: msg.sender,
+            doSendFunds: true
         });
     }
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * projects in `projectIds`. The current settled price is the the price
+     * projects in `projectIds`. The current settled price is the price
      * paid for the most recently purchased token, or the base price if the
      * artist has withdrawn revenues after the auction reached base price.
      * This function is callable at any point, but is expected to typically be
@@ -765,12 +766,14 @@ contract MinterDAExpSettlementV3 is
         // the receipt in storage
         uint256 excessSettlementFunds;
         for (uint256 i; i < projectIdsLength; ) {
-            SettlementExpLib.reclaimProjectExcessSettlementFundsTo({
-                to: to,
-                projectId: projectIds[i],
-                coreContract: coreContracts[i],
-                purchaserAddress: msg.sender
-            });
+            excessSettlementFunds += SettlementExpLib
+                .reclaimProjectExcessSettlementFundsTo({
+                    to: to,
+                    projectId: projectIds[i],
+                    coreContract: coreContracts[i],
+                    purchaserAddress: msg.sender,
+                    doSendFunds: false // do not send funds, just tally
+                });
 
             // gas efficiently increment i
             // won't overflow due to for loop, as well as gas limts
@@ -782,9 +785,10 @@ contract MinterDAExpSettlementV3 is
         // INTERACTIONS
         // send excess settlement funds in a single chunk for all
         // projects
-        bool success_;
-        (success_, ) = to.call{value: excessSettlementFunds}("");
-        require(success_, "Reclaiming failed");
+        if (excessSettlementFunds > 0) {
+            (bool success_, ) = to.call{value: excessSettlementFunds}("");
+            require(success_, "Reclaiming failed");
+        }
     }
 
     /**
@@ -849,7 +853,7 @@ contract MinterDAExpSettlementV3 is
 
         // verify token invocation is valid given local minter max invocations,
         // update local maxHasBeenInvoked
-        MaxInvocationsLib.validatePurchaseEffectsInvocations({
+        MaxInvocationsLib.validateMintEffectsInvocations({
             tokenId: tokenId,
             coreContract: coreContract
         });

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

@@ -197,7 +197,7 @@ contract MinterDAExpV5 is
                 coreContract: coreContract
             })
         ) {
-            syncProjectMaxInvocationsToCore({
+            MaxInvocationsLib.syncProjectMaxInvocationsToCore({
                 projectId: projectId,
                 coreContract: coreContract
             });
@@ -528,7 +528,7 @@ contract MinterDAExpV5 is
             sender: msg.sender
         });
 
-        MaxInvocationsLib.validatePurchaseEffectsInvocations({
+        MaxInvocationsLib.validateMintEffectsInvocations({
             tokenId: tokenId,
             coreContract: coreContract
         });

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

@@ -364,7 +364,7 @@ contract MinterDALinHolderV5 is
                 coreContract: coreContract
             })
         ) {
-            syncProjectMaxInvocationsToCore({
+            MaxInvocationsLib.syncProjectMaxInvocationsToCore({
                 projectId: projectId,
                 coreContract: coreContract
             });
@@ -827,7 +827,7 @@ contract MinterDALinHolderV5 is
 
         // NOTE: delegate-vault handling **ends here**.
 
-        MaxInvocationsLib.validatePurchaseEffectsInvocations({
+        MaxInvocationsLib.validateMintEffectsInvocations({
             tokenId: tokenId,
             coreContract: coreContract
         });

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

@@ -191,7 +191,7 @@ contract MinterDALinV5 is
                 coreContract: coreContract
             })
         ) {
-            syncProjectMaxInvocationsToCore({
+            MaxInvocationsLib.syncProjectMaxInvocationsToCore({
                 projectId: projectId,
                 coreContract: coreContract
             });
@@ -517,7 +517,7 @@ contract MinterDALinV5 is
             sender: msg.sender
         });
 
-        MaxInvocationsLib.validatePurchaseEffectsInvocations({
+        MaxInvocationsLib.validateMintEffectsInvocations({
             tokenId: tokenId,
             coreContract: coreContract
         });