update Engine Flex as PoC (#688)

ArtBlocks · May 3, 2023 · fbb1791 · fbb1791
1 parent 89bd352
commit fbb1791
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/contracts/engine/V3/GenArt721CoreV3_Engine_Flex.sol b/contracts/engine/V3/GenArt721CoreV3_Engine_Flex.sol
@@ -109,9 +109,7 @@ contract GenArt721CoreV3_Engine_Flex is
     IGenArt721CoreContractExposesHashSeed
 {
     using BytecodeStorageWriterV1 for string;
-    using BytecodeStorageReaderV1 for string;
     using BytecodeStorageWriterV1 for address;
-    using BytecodeStorageReaderV1 for address;
     using Bytes32Strings for bytes32;
     uint256 constant ONE_HUNDRED = 100;
     uint256 constant ONE_MILLION = 1_000_000;
@@ -1765,7 +1763,7 @@ contract GenArt721CoreV3_Engine_Flex is
         if (_index >= project.scriptCount) {
             return "";
         }
-        return project.scriptBytecodeAddresses[_index].readFromBytecode();
+        return _readFromBytecode(project.scriptBytecodeAddresses[_index]);
     }
 
     /**
@@ -1996,7 +1994,7 @@ contract GenArt721CoreV3_Engine_Flex is
                 bytecodeAddress: _bytecodeAddress,
                 data: (_dependency.dependencyType ==
                     ExternalAssetDependencyType.ONCHAIN)
-                    ? _bytecodeAddress.readFromBytecode()
+                    ? _readFromBytecode(_bytecodeAddress)
                     : ""
             });
     }
@@ -2219,6 +2217,12 @@ contract GenArt721CoreV3_Engine_Flex is
                 FOUR_WEEKS_IN_SECONDS);
     }
 
+    function _readFromBytecode(
+        address _address
+    ) internal view returns (string memory) {
+        return BytecodeStorageReaderV1.readFromBytecode(_address);
+    }
+
     // strings library from OpenZeppelin, modified for no constants
 
     bytes16 private _HEX_SYMBOLS = "0123456789abcdef";

diff --git a/hardhat.solidity-config.ts b/hardhat.solidity-config.ts
@@ -6,7 +6,7 @@ export const solidityConfig = {
       settings: {
         optimizer: {
           enabled: true,
-          runs: 10,
+          runs: 25,
         },
       },
     },