@artblocks/contracts 1.0.2 → 1.0.3

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

@@ -1,19 +1,20 @@
 // 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_Flex.sol";
-import "./interfaces/0.8.x/IDependencyRegistryCompatibleV0.sol";
-import "./interfaces/0.8.x/IManifold.sol";
+import "../../interfaces/0.8.x/IRandomizer_V3CoreBase.sol";
+import "../../interfaces/0.8.x/IAdminACLV0.sol";
+import "../../interfaces/0.8.x/IEngineRegistryV0.sol";
+import "../../interfaces/0.8.x/IGenArt721CoreContractV3_Engine_Flex.sol";
+import "../../interfaces/0.8.x/IGenArt721CoreContractExposesHashSeed.sol";
+import "../../interfaces/0.8.x/IDependencyRegistryCompatibleV0.sol";
+import "../../interfaces/0.8.x/IManifold.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/0.8.x/ERC721_PackedHashSeed.sol";
+import "../../libs/0.8.x/BytecodeStorageV1.sol";
+import "../../libs/0.8.x/Bytes32Strings.sol";
 
 /**
  * @title Art Blocks Engine Flex ERC-721 core contract, V3.
@@ -104,10 +105,10 @@ contract GenArt721CoreV3_Engine_Flex is
     Ownable,
     IDependencyRegistryCompatibleV0,
     IManifold,
-    IGenArt721CoreContractV3_Engine_Flex
+    IGenArt721CoreContractV3_Engine_Flex,
+    IGenArt721CoreContractExposesHashSeed
 {
-    using BytecodeStorage for string;
-    using BytecodeStorage for address;
+    using BytecodeStorageWriter for string;
     using Bytes32Strings for bytes32;
     uint256 constant ONE_HUNDRED = 100;
     uint256 constant ONE_MILLION = 1_000_000;
@@ -164,7 +165,7 @@ contract GenArt721CoreV3_Engine_Flex 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
@@ -1318,9 +1319,8 @@ contract GenArt721CoreV3_Engine_Flex 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);
     }
@@ -1337,8 +1337,7 @@ contract GenArt721CoreV3_Engine_Flex 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;
@@ -1763,7 +1762,7 @@ contract GenArt721CoreV3_Engine_Flex is
         if (_index >= project.scriptCount) {
             return "";
         }
-        return project.scriptBytecodeAddresses[_index].readFromBytecode();
+        return _readFromBytecode(project.scriptBytecodeAddresses[_index]);
     }
 
     /**
@@ -1994,7 +1993,7 @@ contract GenArt721CoreV3_Engine_Flex is
                 bytecodeAddress: _bytecodeAddress,
                 data: (_dependency.dependencyType ==
                     ExternalAssetDependencyType.ONCHAIN)
-                    ? _bytecodeAddress.readFromBytecode()
+                    ? _readFromBytecode(_bytecodeAddress)
                     : ""
             });
     }
@@ -2168,7 +2167,7 @@ contract GenArt721CoreV3_Engine_Flex 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);
@@ -2217,6 +2216,16 @@ contract GenArt721CoreV3_Engine_Flex is
                 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);
+    }
+
     // strings library from OpenZeppelin, modified for no constants
 
     bytes16 private _HEX_SYMBOLS = "0123456789abcdef";