@artblocks/contracts 1.1.0 → 1.2.0

package/contracts/{GenArt721CoreV3.sol → archive/GenArt721CoreV3.sol}

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity 0.8.19;
+pragma solidity 0.8.22;
 
 // Created By: Art Blocks Inc.
 
-import "./interfaces/v0.8.x/IRandomizer_V3CoreBase.sol";
-import "./interfaces/v0.8.x/IAdminACLV0.sol";
-import "./interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
-import "./interfaces/v0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
-import "./interfaces/v0.8.x/IManifold.sol";
+import "../interfaces/v0.8.x/IRandomizer_V3CoreBase.sol";
+import "../interfaces/v0.8.x/IAdminACLV0.sol";
+import "../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
+import "../interfaces/v0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
+import "../interfaces/v0.8.x/IManifold.sol";
 
 import "@openzeppelin-4.7/contracts/utils/Strings.sol";
 import "@openzeppelin-4.7/contracts/access/Ownable.sol";
-import "./libs/v0.8.x/ERC721_PackedHashSeed.sol";
-import "./libs/v0.8.x/BytecodeStorageV1.sol";
-import "./libs/v0.8.x/Bytes32Strings.sol";
+import "../libs/v0.8.x/ERC721_PackedHashSeed.sol";
+import "../libs/v0.8.x/BytecodeStorageV1.sol";
+import "../libs/v0.8.x/Bytes32Strings.sol";
 
 /**
  * @title Art Blocks ERC-721 core contract, V3.
@@ -103,7 +103,7 @@ contract GenArt721CoreV3 is
     uint8 constant AT_CHARACTER_CODE = uint8(bytes1("@")); // 0x40
 
     // numeric constants
-    uint256 constant ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE = 25; // 25%
+    // max art blocks primary sales percentage is 100%
     uint256 constant ART_BLOCKS_MAX_SECONDARY_SALES_BPS = 10000; // 10_000 BPS = 100%
     uint256 constant ARTIST_MAX_SECONDARY_ROYALTY_PERCENTAGE = 95; // 95%
 
@@ -125,10 +125,13 @@ contract GenArt721CoreV3 is
     bytes32 constant FIELD_ARTBLOCKS_SECONDARY_SALES_ADDRESS =
         "artblocksSecondarySalesAddress";
     bytes32 constant FIELD_RANDOMIZER_ADDRESS = "randomizerAddress";
+    bytes32 constant FIELD_NEXT_CORE_CONTRACT = "nextCoreContract";
     bytes32 constant FIELD_ARTBLOCKS_CURATION_REGISTRY_ADDRESS =
         "curationRegistryAddress";
     bytes32 constant FIELD_ARTBLOCKS_DEPENDENCY_REGISTRY_ADDRESS =
         "dependencyRegistryAddress";
+    bytes32 constant FIELD_ARTBLOCKS_ON_CHAIN_GENERATOR_ADDRESS =
+        "onChainGeneratorAddress";
     bytes32 constant FIELD_ARTBLOCKS_PRIMARY_SALES_PERCENTAGE =
         "artblocksPrimaryPercentage";
     bytes32 constant FIELD_ARTBLOCKS_SECONDARY_SALES_BPS =
@@ -160,11 +163,15 @@ contract GenArt721CoreV3 is
     /// Art Blocks Project ID range: [3-373]
     address public constant ART_BLOCKS_ERC721TOKEN_ADDRESS_V1 =
         0xa7d8d9ef8D8Ce8992Df33D8b8CF4Aebabd5bD270;
+    /// pointer to next core contract associated with this contract
+    address public nextCoreContract;
 
     /// Curation registry managed by Art Blocks
     address public artblocksCurationRegistryAddress;
     /// Dependency registry managed by Art Blocks
     address public artblocksDependencyRegistryAddress;
+    /// On chain generator managed by Art Blocks
+    address public artblocksOnChainGeneratorAddress;
 
     /// current randomizer contract
     IRandomizer_V3CoreBase public randomizerContract;
@@ -484,6 +491,16 @@ contract GenArt721CoreV3 is
         Ownable.renounceOwnership();
     }
 
+    /**
+     * @notice Updates reference to next core contract, associated with this contract.
+     * @param _nextCoreContract Address of the next core contract
+     */
+    function updateNextCoreContract(address _nextCoreContract) external {
+        _onlyAdminACL(this.updateNextCoreContract.selector);
+        nextCoreContract = _nextCoreContract;
+        emit PlatformUpdated(FIELD_NEXT_CORE_CONTRACT);
+    }
+
     /**
      * @notice Updates reference to Art Blocks Curation Registry contract.
      * @param _artblocksCurationRegistryAddress Address of new Curation
@@ -512,6 +529,19 @@ contract GenArt721CoreV3 is
         emit PlatformUpdated(FIELD_ARTBLOCKS_DEPENDENCY_REGISTRY_ADDRESS);
     }
 
+    /**
+     * @notice Updates reference to Art Blocks On Chain Generator contract.
+     * @param _artblocksOnChainGeneratorAddress Address of new on chain generator.
+     */
+    function updateArtblocksOnChainGeneratorAddress(
+        address _artblocksOnChainGeneratorAddress
+    ) external {
+        _onlyAdminACL(this.updateArtblocksOnChainGeneratorAddress.selector);
+        _onlyNonZeroAddress(_artblocksOnChainGeneratorAddress);
+        artblocksOnChainGeneratorAddress = _artblocksOnChainGeneratorAddress;
+        emit PlatformUpdated(FIELD_ARTBLOCKS_ON_CHAIN_GENERATOR_ADDRESS);
+    }
+
     /**
      * @notice Updates artblocksPrimarySalesAddress to
      * `_artblocksPrimarySalesAddress`.
@@ -550,11 +580,8 @@ contract GenArt721CoreV3 is
         uint256 artblocksPrimarySalesPercentage_
     ) external {
         _onlyAdminACL(this.updateArtblocksPrimarySalesPercentage.selector);
-        require(
-            artblocksPrimarySalesPercentage_ <=
-                ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE,
-            "Max of ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE percent"
-        );
+        // anything above 100 percent is illogical
+        require(artblocksPrimarySalesPercentage_ <= 100, "Max of 100 percent");
         _artblocksPrimarySalesPercentage = uint8(
             artblocksPrimarySalesPercentage_
         );
@@ -896,6 +923,8 @@ contract GenArt721CoreV3 is
     /**
      * @notice Updates artist name for project `_projectId` to be
      * `_projectArtistName`.
+     * @dev allows admin to update after project is locked, due to our
+     * experiences of artist name changes being requested post-lock.
      * @param _projectId Project ID.
      * @param _projectArtistName New artist name.
      */
@@ -903,10 +932,17 @@ contract GenArt721CoreV3 is
         uint256 _projectId,
         string memory _projectArtistName
     ) external {
-        _onlyUnlocked(_projectId);
-        _onlyArtistOrAdminACL(
-            _projectId,
-            this.updateProjectArtistName.selector
+        // checks
+        // if unlocked, only artist may update, if locked, only admin may update
+        require(
+            _projectUnlocked(_projectId)
+                ? msg.sender == projectIdToFinancials[_projectId].artistAddress
+                : adminACLAllowed(
+                    msg.sender,
+                    address(this),
+                    this.updateProjectArtistName.selector
+                ),
+            "Only artist, owner when locked"
         );
         _onlyNonEmptyString(_projectArtistName);
         projects[_projectId].artist = _projectArtistName;
@@ -967,7 +1003,7 @@ contract GenArt721CoreV3 is
                     address(this),
                     this.updateProjectDescription.selector
                 ),
-            "Only artist when unlocked, owner when locked"
+            "Only artist, owner when locked"
         );
         // effects
         // store description in contract bytecode, replacing reference address from

package/contracts/{explorations → archive}/GenArt721CoreV3_Explorations.sol

@@ -43,7 +43,7 @@ import "../libs/v0.8.x/Bytes32Strings.sol";
  * - forbidNewProjects (forever forbidding new projects)
  * - updateDefaultBaseURI (used to initialize new project base URIs)
  * ----------------------------------------------------------------------------
- * The following functions are restricted to either the the Artist address or
+ * The following functions are restricted to either the Artist address or
  * the Admin ACL contract, only when the project is not locked:
  * - updateProjectName
  * - updateProjectArtistName
@@ -103,7 +103,7 @@ contract GenArt721CoreV3_Explorations is
     uint8 constant AT_CHARACTER_CODE = uint8(bytes1("@")); // 0x40
 
     // numeric constants
-    uint256 constant ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE = 100; // 100%
+    // max art blocks primary sales percentage is 100%
     uint256 constant ART_BLOCKS_MAX_SECONDARY_SALES_BPS = 10000; // 10_000 BPS = 100%
     uint256 constant ARTIST_MAX_SECONDARY_ROYALTY_PERCENTAGE = 95; // 95%
 
@@ -125,11 +125,14 @@ contract GenArt721CoreV3_Explorations is
     bytes32 constant FIELD_ARTBLOCKS_SECONDARY_SALES_ADDRESS =
         "artblocksSecondarySalesAddress";
     bytes32 constant FIELD_RANDOMIZER_ADDRESS = "randomizerAddress";
+    bytes32 constant FIELD_NEXT_CORE_CONTRACT = "nextCoreContract";
     // note: Curation registry address will never be updated on V3 Explorations
     bytes32 constant FIELD_ARTBLOCKS_CURATION_REGISTRY_ADDRESS =
         "curationRegistryAddress";
     bytes32 constant FIELD_ARTBLOCKS_DEPENDENCY_REGISTRY_ADDRESS =
         "dependencyRegistryAddress";
+    bytes32 constant FIELD_ARTBLOCKS_ON_CHAIN_GENERATOR_ADDRESS =
+        "onChainGeneratorAddress";
     bytes32 constant FIELD_ARTBLOCKS_PRIMARY_SALES_PERCENTAGE =
         "artblocksPrimaryPercentage";
     bytes32 constant FIELD_ARTBLOCKS_SECONDARY_SALES_BPS =
@@ -154,12 +157,17 @@ contract GenArt721CoreV3_Explorations is
     bytes32 constant FIELD_PROJECT_ASPECT_RATIO = "aspectRatio";
     bytes32 constant FIELD_PROJECT_BASE_URI = "baseURI";
 
+    /// pointer to next core contract associated with this contract
+    address public nextCoreContract;
+
     /// Curation registry is not relevant for Art Blocks Explorations, and will
     /// remain null for interface-conformance purposes only, specifically for
     /// indexing layers.
     address public artblocksCurationRegistryAddress;
     /// Dependency registry managed by Art Blocks
     address public artblocksDependencyRegistryAddress;
+    /// On chain generator managed by Art Blocks
+    address public artblocksOnChainGeneratorAddress;
 
     /// current randomizer contract
     IRandomizerV2 public randomizerContract;
@@ -408,7 +416,7 @@ contract GenArt721CoreV3_Explorations is
         unchecked {
             // invocationsBefore is uint24 << max uint256. In production use,
             // _projectId * ONE_MILLION must be << max uint256, otherwise
-            // tokenIdToProjectId function become invalid.
+            // tokenIdToProjectId function becomes invalid.
             // Therefore, no risk of overflow
             thisTokenId = (_projectId * ONE_MILLION) + invocationsBefore;
         }
@@ -489,6 +497,16 @@ contract GenArt721CoreV3_Explorations is
         Ownable.renounceOwnership();
     }
 
+    /**
+     * @notice Updates reference to next core contract, associated with this contract.
+     * @param _nextCoreContract Address of the next core contract
+     */
+    function updateNextCoreContract(address _nextCoreContract) external {
+        _onlyAdminACL(this.updateNextCoreContract.selector);
+        nextCoreContract = _nextCoreContract;
+        emit PlatformUpdated(FIELD_NEXT_CORE_CONTRACT);
+    }
+
     /**
      * @notice Warning: Configuring Curation Registry contract is not supported
      * on V3 Explorations version of this contract.
@@ -518,6 +536,19 @@ contract GenArt721CoreV3_Explorations is
         emit PlatformUpdated(FIELD_ARTBLOCKS_DEPENDENCY_REGISTRY_ADDRESS);
     }
 
+    /**
+     * @notice Updates reference to Art Blocks On Chain Generator contract.
+     * @param _artblocksOnChainGeneratorAddress Address of new on chain generator.
+     */
+    function updateArtblocksOnChainGeneratorAddress(
+        address _artblocksOnChainGeneratorAddress
+    ) external {
+        _onlyAdminACL(this.updateArtblocksOnChainGeneratorAddress.selector);
+        _onlyNonZeroAddress(_artblocksOnChainGeneratorAddress);
+        artblocksOnChainGeneratorAddress = _artblocksOnChainGeneratorAddress;
+        emit PlatformUpdated(FIELD_ARTBLOCKS_ON_CHAIN_GENERATOR_ADDRESS);
+    }
+
     /**
      * @notice Updates artblocksPrimarySalesAddress to
      * `_artblocksPrimarySalesAddress`.
@@ -556,11 +587,8 @@ contract GenArt721CoreV3_Explorations is
         uint256 artblocksPrimarySalesPercentage_
     ) external {
         _onlyAdminACL(this.updateArtblocksPrimarySalesPercentage.selector);
-        require(
-            artblocksPrimarySalesPercentage_ <=
-                ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE,
-            "Max of ART_BLOCKS_MAX_PRIMARY_SALES_PERCENTAGE percent"
-        );
+        // anything above 100 percent is illogical
+        require(artblocksPrimarySalesPercentage_ <= 100, "Max of 100 percent");
         _artblocksPrimarySalesPercentage = uint8(
             artblocksPrimarySalesPercentage_
         );
@@ -902,6 +930,8 @@ contract GenArt721CoreV3_Explorations is
     /**
      * @notice Updates artist name for project `_projectId` to be
      * `_projectArtistName`.
+     * @dev allows admin to update after project is locked, due to our
+     * experiences of artist name changes being requested post-lock.
      * @param _projectId Project ID.
      * @param _projectArtistName New artist name.
      */
@@ -909,10 +939,16 @@ contract GenArt721CoreV3_Explorations is
         uint256 _projectId,
         string memory _projectArtistName
     ) external {
-        _onlyUnlocked(_projectId);
-        _onlyArtistOrAdminACL(
-            _projectId,
-            this.updateProjectArtistName.selector
+        // if unlocked, only artist may update, if locked, only admin may update
+        require(
+            _projectUnlocked(_projectId)
+                ? msg.sender == projectIdToFinancials[_projectId].artistAddress
+                : adminACLAllowed(
+                    msg.sender,
+                    address(this),
+                    this.updateProjectArtistName.selector
+                ),
+            "Only artist, owner when locked"
         );
         _onlyNonEmptyString(_projectArtistName);
         projects[_projectId].artist = _projectArtistName;
@@ -973,7 +1009,7 @@ contract GenArt721CoreV3_Explorations is
                     address(this),
                     this.updateProjectDescription.selector
                 ),
-            "Only artist when unlocked, owner when locked"
+            "Only artist, owner when locked"
         );
         // effects
         // store description in contract bytecode, replacing reference address from

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

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../interfaces/v0.8.x/IMinterBaseV0.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/IMinterBaseV0.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 "@openzeppelin-4.7/contracts/token/ERC20/IERC20.sol";
 

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterDAExp}/MinterDAExpV4.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/IFilteredMinterDAExpV1.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/IFilteredMinterDAExpV1.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/math/SafeCast.sol";

package/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV0.sol

@@ -678,7 +678,7 @@ contract MinterDAExpSettlementV0 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -694,7 +694,7 @@ contract MinterDAExpSettlementV0 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -750,7 +750,7 @@ contract MinterDAExpSettlementV0 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
@@ -774,7 +774,7 @@ contract MinterDAExpSettlementV0 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

package/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV1.sol

@@ -4,7 +4,7 @@
 import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
 import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
 import "../../../../interfaces/v0.8.x/IFilteredMinterDAExpSettlementV0.sol";
-import "../../../../minter-suite/Minters/MinterBase_v0_1_1.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.7/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.7/contracts/utils/math/SafeCast.sol";
@@ -688,7 +688,7 @@ contract MinterDAExpSettlementV1 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -704,7 +704,7 @@ contract MinterDAExpSettlementV1 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -760,7 +760,7 @@ contract MinterDAExpSettlementV1 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
@@ -784,7 +784,7 @@ contract MinterDAExpSettlementV1 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

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterDAExpSettlement}/MinterDAExpSettlementV2.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/IFilteredMinterDAExpSettlementV1.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/IFilteredMinterDAExpSettlementV1.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.7/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.7/contracts/utils/math/SafeCast.sol";
@@ -727,7 +727,7 @@ contract MinterDAExpSettlementV2 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -743,7 +743,7 @@ contract MinterDAExpSettlementV2 is
 
     /**
      * @notice Reclaims the sender's payment above current settled price for
-     * project `_projectId`. The current settled price is the the price paid
+     * project `_projectId`. 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
@@ -799,7 +799,7 @@ contract MinterDAExpSettlementV2 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
@@ -823,7 +823,7 @@ contract MinterDAExpSettlementV2 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

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterDALin}/MinterDALinV4.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/IFilteredMinterDALinV1.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/IFilteredMinterDALinV1.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/math/SafeCast.sol";

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterHolder}/MinterHolderV4.sol

@@ -1,11 +1,11 @@
 // 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/IFilteredMinterHolderV2.sol";
-import "./MinterBase_v0_1_1.sol";
-import "../../interfaces/v0.8.x/IDelegationRegistry.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterHolderV2.sol";
+import "../MinterBase_v0_1_1.sol";
+import "../../../../interfaces/v0.8.x/IDelegationRegistry.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterMerkle}/MinterMerkleV5.sol

@@ -1,11 +1,11 @@
 // 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/IFilteredMinterMerkleV2.sol";
-import "../../interfaces/v0.8.x/IDelegationRegistry.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/IFilteredMinterMerkleV2.sol";
+import "../../../../interfaces/v0.8.x/IDelegationRegistry.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.7/contracts/utils/cryptography/MerkleProof.sol";
 import "@openzeppelin-4.7/contracts/token/ERC20/IERC20.sol";

package/contracts/{minter-suite/Minters → archive/minter-suite/Minters/MinterPolyptych}/MinterPolyptychV0.sol

@@ -1,13 +1,13 @@
 // 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/IGenArt721CoreContractExposesHashSeed.sol";
-import "../../interfaces/v0.8.x/IMinterFilterV0.sol";
-import "../../interfaces/v0.8.x/IFilteredMinterHolderV2.sol";
-import "../../interfaces/v0.8.x/IRandomizerPolyptychV0.sol";
-import "../../interfaces/v0.8.x/IDelegationRegistry.sol";
-import "./MinterBase_v0_1_1.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterHolderV2.sol";
+import "../../../../interfaces/v0.8.x/IRandomizerPolyptychV0.sol";
+import "../../../../interfaces/v0.8.x/IDelegationRegistry.sol";
+import "../MinterBase_v0_1_1.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";

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";