@artblocks/contracts 1.0.2 → 1.0.4

package/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV3.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV3.sol";
-import "../../../../interfaces/0.8.x/IMinterFilterV0.sol";
-import "../../../../interfaces/0.8.x/IFilteredMinterV2.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV2.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 /**
  * @title Filtered Minter contract that allows tokens to be minted with ETH.

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

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV1.sol";
-import "../../../../interfaces/0.8.x/IMinterFilterV0.sol";
-import "../../../../interfaces/0.8.x/IFilteredMinterV0.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV1.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV0.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";

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

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV1.sol";
-import "../../../../interfaces/0.8.x/IMinterFilterV0.sol";
-import "../../../../interfaces/0.8.x/IFilteredMinterV0.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV1.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV0.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";

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

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV3.sol";
-import "../../../../interfaces/0.8.x/IMinterFilterV0.sol";
-import "../../../../interfaces/0.8.x/IFilteredMinterV0.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV0.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 /**
  * @title Filtered Minter contract that allows tokens to be minted with ETH

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

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV3.sol";
-import "../../../../interfaces/0.8.x/IMinterFilterV0.sol";
-import "../../../../interfaces/0.8.x/IFilteredMinterV2.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3.sol";
+import "../../../../interfaces/v0.8.x/IMinterFilterV0.sol";
+import "../../../../interfaces/v0.8.x/IFilteredMinterV2.sol";
 
 import "@openzeppelin-4.5/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 /**
  * @title Filtered Minter contract that allows tokens to be minted with ETH

package/contracts/engine/{GenArt721CoreV2_ENGINE_FLEX.sol → V2/GenArt721CoreV2_ENGINE_FLEX.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IRandomizer.sol";
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IRandomizer.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
 import "@openzeppelin-4.5/contracts/utils/Strings.sol";
 import "@openzeppelin-4.5/contracts/token/ERC721/ERC721.sol";
 

package/contracts/engine/{GenArt721CoreV2_PBAB.sol → V2/GenArt721CoreV2_PBAB.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IRandomizer.sol";
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IRandomizer.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
 
 import "@openzeppelin-4.5/contracts/utils/Strings.sol";
 

package/contracts/engine/{GenArt721CoreV2_PRTNR.sol → V2/GenArt721CoreV2_PRTNR.sol}

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IRandomizer.sol";
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
-import "../interfaces/0.8.x/IGenArt721CoreContractV1.sol";
+import "../../interfaces/v0.8.x/IRandomizer.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreContractV1.sol";
 
 import "@openzeppelin-4.5/contracts/utils/Strings.sol";
 

package/contracts/engine/{GenArt721MinterBurner_PBAB.sol → V2/GenArt721MinterBurner_PBAB.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
-import "../interfaces/0.8.x/IBonusContract.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IBonusContract.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/Strings.sol";

package/contracts/engine/{GenArt721MinterDAExp_PBAB.sol → V2/GenArt721MinterDAExp_PBAB.sol}

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/math/SafeCast.sol";
 
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 /**
  * @title A minter contract that allows tokens to be minted with ETH.

package/contracts/engine/{GenArt721Minter_PBAB.sol → V2/GenArt721Minter_PBAB.sol}

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // Created By: Art Blocks Inc.
 
-import "../interfaces/0.8.x/IGenArt721CoreV2_PBAB.sol";
-import "../interfaces/0.8.x/IBonusContract.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreV2_PBAB.sol";
+import "../../interfaces/v0.8.x/IBonusContract.sol";
 
 import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin-4.5/contracts/utils/Strings.sol";

package/contracts/{GenArt721CoreV3_Engine.sol → engine/V3/GenArt721CoreV3_Engine.sol}

@@ -1,20 +1,21 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 // Created By: Art Blocks Inc.
 
-import "./interfaces/0.8.x/IRandomizerV2.sol";
-import "./interfaces/0.8.x/IAdminACLV0.sol";
-import "./interfaces/0.8.x/IEngineRegistryV0.sol";
-import "./interfaces/0.8.x/IGenArt721CoreContractV3_Engine.sol";
-import "./interfaces/0.8.x/IDependencyRegistryCompatibleV0.sol";
-import "./interfaces/0.8.x/IManifold.sol";
+import "../../interfaces/v0.8.x/IRandomizer_V3CoreBase.sol";
+import "../../interfaces/v0.8.x/IAdminACLV0.sol";
+import "../../interfaces/v0.8.x/IEngineRegistryV0.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
+import "../../interfaces/v0.8.x/IDependencyRegistryCompatibleV0.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/0.8.x/ERC721_PackedHashSeed.sol";
-import "./libs/0.8.x/BytecodeStorage.sol";
-import "./libs/0.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 Engine ERC-721 core contract, V3.
@@ -96,10 +97,10 @@ contract GenArt721CoreV3_Engine is
     Ownable,
     IDependencyRegistryCompatibleV0,
     IManifold,
-    IGenArt721CoreContractV3_Engine
+    IGenArt721CoreContractV3_Engine,
+    IGenArt721CoreContractExposesHashSeed
 {
-    using BytecodeStorage for string;
-    using BytecodeStorage for address;
+    using BytecodeStorageWriter for string;
     using Bytes32Strings for bytes32;
     using Strings for uint256;
     using Strings for address;
@@ -158,7 +159,7 @@ contract GenArt721CoreV3_Engine is
     address public artblocksDependencyRegistryAddress;
 
     /// current randomizer contract
-    IRandomizerV2 public randomizerContract;
+    IRandomizer_V3CoreBase public randomizerContract;
 
     /// append-only array of all randomizer contract addresses ever used by
     /// this contract
@@ -177,7 +178,7 @@ contract GenArt721CoreV3_Engine is
         bool paused;
         string name;
         string artist;
-        string description;
+        address descriptionAddress;
         string website;
         string license;
         string projectBaseURI;
@@ -258,7 +259,7 @@ contract GenArt721CoreV3_Engine is
     bool public immutable autoApproveArtistSplitProposals;
 
     /// version & type of this core contract
-    bytes32 constant CORE_VERSION = "v3.1.2";
+    bytes32 constant CORE_VERSION = "v3.1.3";
 
     function coreVersion() external pure returns (string memory) {
         return CORE_VERSION.toString();
@@ -1008,6 +1009,13 @@ contract GenArt721CoreV3_Engine is
     /**
      * @notice Updates description of project `_projectId`.
      * Only artist may call when unlocked, only admin may call when locked.
+     * Note: The BytecodeStorage library is used to store the description to
+     * reduce initial upload cost, however, even minor edits will require an
+     * expensive, entirely new bytecode storage contract to be deployed instead
+     * of relatively cheap updates to already-warm storage slots. This results
+     * in an increased gas cost for minor edits to the description after the
+     * initial upload, but an overall decrease in gas cost for projects with
+     * less than ~3-5 edits (depending on the length of the description).
      * @param _projectId Project ID.
      * @param _projectDescription New project description.
      */
@@ -1027,7 +1035,10 @@ contract GenArt721CoreV3_Engine is
             "Only artist when unlocked, owner when locked"
         );
         // effects
-        projects[_projectId].description = _projectDescription;
+        // store description in contract bytecode, replacing reference address from
+        // the old storage description with the newly created one
+        projects[_projectId].descriptionAddress = _projectDescription
+            .writeToBytecode();
         emit ProjectUpdated(_projectId, FIELD_PROJECT_DESCRIPTION);
     }
 
@@ -1132,9 +1143,8 @@ contract GenArt721CoreV3_Engine is
         _onlyNonEmptyString(_script);
         Project storage project = projects[_projectId];
         require(_scriptId < project.scriptCount, "scriptId out of range");
-
         // store script in contract bytecode, replacing reference address from
-        // the contract that no longer exists with the newly created one
+        // the old storage contract with the newly created one
         project.scriptBytecodeAddresses[_scriptId] = _script.writeToBytecode();
         emit ProjectUpdated(_projectId, FIELD_PROJECT_SCRIPT);
     }
@@ -1151,8 +1161,7 @@ contract GenArt721CoreV3_Engine is
         );
         Project storage project = projects[_projectId];
         require(project.scriptCount > 0, "No scripts to remove");
-
-        // delete reference to contract address that no longer exists
+        // delete reference to old storage contract address
         delete project.scriptBytecodeAddresses[project.scriptCount - 1];
         unchecked {
             project.scriptCount = project.scriptCount - 1;
@@ -1437,7 +1446,12 @@ contract GenArt721CoreV3_Engine is
         Project storage project = projects[_projectId];
         projectName = project.name;
         artist = project.artist;
-        description = project.description;
+        address projectDescriptionBytecodeAddress = project.descriptionAddress;
+        if (projectDescriptionBytecodeAddress == address(0)) {
+            description = "";
+        } else {
+            description = _readFromBytecode(projectDescriptionBytecodeAddress);
+        }
         website = project.website;
         license = project.license;
     }
@@ -1577,7 +1591,7 @@ contract GenArt721CoreV3_Engine is
         if (_index >= project.scriptCount) {
             return "";
         }
-        return project.scriptBytecodeAddresses[_index].readFromBytecode();
+        return _readFromBytecode(project.scriptBytecodeAddresses[_index]);
     }
 
     /**
@@ -1947,7 +1961,7 @@ contract GenArt721CoreV3_Engine is
      * perform input validation where applicable.
      */
     function _updateRandomizerAddress(address _randomizerAddress) internal {
-        randomizerContract = IRandomizerV2(_randomizerAddress);
+        randomizerContract = IRandomizer_V3CoreBase(_randomizerAddress);
         // populate historical randomizer array
         _historicalRandomizerAddresses.push(_randomizerAddress);
         emit PlatformUpdated(FIELD_RANDOMIZER_ADDRESS);
@@ -1996,4 +2010,14 @@ contract GenArt721CoreV3_Engine is
             (block.timestamp - projectCompletedTimestamp <
                 FOUR_WEEKS_IN_SECONDS);
     }
+
+    /**
+     * Helper for calling `BytecodeStorageReader` external library reader method,
+     * added for bytecode size reduction purposes.
+     */
+    function _readFromBytecode(
+        address _address
+    ) internal view returns (string memory) {
+        return BytecodeStorageReader.readFromBytecode(_address);
+    }
 }