@artblocks/contracts 1.0.3 → 1.1.0

package/contracts/engine/V3/GenArt721CoreV3_Engine.sol

@@ -3,19 +3,18 @@ pragma solidity 0.8.19;
 
 // Created By: Art Blocks Inc.
 
-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.sol";
-import "../../interfaces/0.8.x/IGenArt721CoreContractExposesHashSeed.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/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/BytecodeStorageV1.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.
@@ -178,7 +177,7 @@ contract GenArt721CoreV3_Engine is
         bool paused;
         string name;
         string artist;
-        string description;
+        address descriptionAddress;
         string website;
         string license;
         string projectBaseURI;
@@ -259,7 +258,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.4";
 
     function coreVersion() external pure returns (string memory) {
         return CORE_VERSION.toString();
@@ -366,8 +365,7 @@ contract GenArt721CoreV3_Engine is
         address _randomizerContract,
         address _adminACLContract,
         uint248 _startingProjectId,
-        bool _autoApproveArtistSplitProposals,
-        address _engineRegistryContract
+        bool _autoApproveArtistSplitProposals
     ) ERC721_PackedHashSeed(_tokenName, _tokenSymbol) {
         _onlyNonZeroAddress(_renderProviderAddress);
         _onlyNonZeroAddress(_platformProviderAddress);
@@ -398,12 +396,8 @@ contract GenArt721CoreV3_Engine is
         // initialize next project ID
         _nextProjectId = _startingProjectId;
         emit PlatformUpdated(FIELD_NEXT_PROJECT_ID);
-        // register contract as an Engine contract
-        IEngineRegistryV0(_engineRegistryContract).registerContract(
-            address(this),
-            CORE_VERSION,
-            CORE_TYPE
-        );
+        // @dev follow-on action: This contract does not self-register. A core
+        // registry owner must register contract in a subsequent call.
     }
 
     /**
@@ -1009,6 +1003,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.
      */
@@ -1028,7 +1029,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);
     }
 
@@ -1436,7 +1440,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;
     }

package/contracts/engine/V3/GenArt721CoreV3_Engine_Flex.sol

@@ -3,18 +3,17 @@ pragma solidity 0.8.19;
 
 // Created By: Art Blocks Inc.
 
-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 "../../interfaces/v0.8.x/IRandomizer_V3CoreBase.sol";
+import "../../interfaces/v0.8.x/IAdminACLV0.sol";
+import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine_Flex.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/access/Ownable.sol";
-import "../../libs/0.8.x/ERC721_PackedHashSeed.sol";
-import "../../libs/0.8.x/BytecodeStorageV1.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 Flex ERC-721 core contract, V3.
@@ -184,7 +183,7 @@ contract GenArt721CoreV3_Engine_Flex is
         bool paused;
         string name;
         string artist;
-        string description;
+        address descriptionAddress;
         string website;
         string license;
         string projectBaseURI;
@@ -271,7 +270,7 @@ contract GenArt721CoreV3_Engine_Flex is
     bool public immutable autoApproveArtistSplitProposals;
 
     /// version & type of this core contract
-    bytes32 constant CORE_VERSION = "v3.1.2";
+    bytes32 constant CORE_VERSION = "v3.1.4";
 
     function coreVersion() external pure returns (string memory) {
         return CORE_VERSION.toString();
@@ -387,8 +386,7 @@ contract GenArt721CoreV3_Engine_Flex is
         address _randomizerContract,
         address _adminACLContract,
         uint248 _startingProjectId,
-        bool _autoApproveArtistSplitProposals,
-        address _engineRegistryContract
+        bool _autoApproveArtistSplitProposals
     ) ERC721_PackedHashSeed(_tokenName, _tokenSymbol) {
         _onlyNonZeroAddress(_renderProviderAddress);
         _onlyNonZeroAddress(_platformProviderAddress);
@@ -419,12 +417,8 @@ contract GenArt721CoreV3_Engine_Flex is
         // initialize next project ID
         _nextProjectId = _startingProjectId;
         emit PlatformUpdated(FIELD_NEXT_PROJECT_ID);
-        // register contract as an Engine contract
-        IEngineRegistryV0(_engineRegistryContract).registerContract(
-            address(this),
-            CORE_VERSION,
-            CORE_TYPE
-        );
+        // @dev follow-on action: This contract does not self-register. A core
+        // registry owner must register contract in a subsequent call.
     }
 
     /**
@@ -1195,6 +1189,13 @@ contract GenArt721CoreV3_Engine_Flex 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.
      */
@@ -1214,7 +1215,10 @@ contract GenArt721CoreV3_Engine_Flex 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);
     }
 
@@ -1622,7 +1626,12 @@ contract GenArt721CoreV3_Engine_Flex 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;
     }

package/contracts/engine/V3/forks/GenArt721CoreV3_Engine_Flex_PROOF.sol

@@ -3,17 +3,16 @@ 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/v0.8.x/IRandomizerV2.sol";
+import "../../../interfaces/v0.8.x/IAdminACLV0.sol";
+import "../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine_Flex.sol";
+import "../../../interfaces/v0.8.x/IDependencyRegistryCompatibleV0.sol";
+import "../../../interfaces/v0.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/BytecodeStorageV1.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 Flex ERC-721 core contract, V3.
@@ -272,7 +271,7 @@ contract GenArt721CoreV3_Engine_Flex_PROOF is
     bool public immutable autoApproveArtistSplitProposals;
 
     /// version & type of this core contract
-    bytes32 constant CORE_VERSION = "v3.1.2";
+    bytes32 constant CORE_VERSION = "v3.1.6";
 
     function coreVersion() external pure returns (string memory) {
         return CORE_VERSION.toString();
@@ -381,8 +380,7 @@ contract GenArt721CoreV3_Engine_Flex_PROOF is
         address _randomizerContract,
         address _adminACLContract,
         uint248 _startingProjectId,
-        bool _autoApproveArtistSplitProposals,
-        address _engineRegistryContract
+        bool _autoApproveArtistSplitProposals
     ) ERC721_PackedHashSeed(_tokenName, _tokenSymbol) {
         _onlyNonZeroAddress(_renderProviderAddress);
         _onlyNonZeroAddress(_platformProviderAddress);
@@ -413,12 +411,8 @@ contract GenArt721CoreV3_Engine_Flex_PROOF is
         // initialize next project ID
         _nextProjectId = _startingProjectId;
         emit PlatformUpdated(FIELD_NEXT_PROJECT_ID);
-        // register contract as an Engine contract
-        IEngineRegistryV0(_engineRegistryContract).registerContract(
-            address(this),
-            CORE_VERSION,
-            CORE_TYPE
-        );
+        // @dev follow-on action: This contract does not self-register. A core
+        // registry owner must register contract in a subsequent call.
     }
 
     /**

package/contracts/engine/V3/forks/PROHIBITION/AdminACLV0_PROHIBITION.sol

@@ -3,7 +3,7 @@
 pragma solidity 0.8.19;
 
 import "./interfaces/IAdminACLV0_PROHIBITION.sol";
-import "../../../../interfaces/0.8.x/IGenArt721CoreContractV3_Base.sol";
+import "../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
 
 import "@openzeppelin-4.7/contracts/access/Ownable.sol";
 import "@openzeppelin-4.7/contracts/utils/introspection/ERC165.sol";

package/contracts/engine/V3/forks/PROHIBITION/GenArt721CoreV3_Engine_Flex_PROHIBITION.sol

@@ -6,15 +6,14 @@ pragma solidity 0.8.19;
 import "./interfaces/IAdminACLV0_PROHIBITION.sol";
 import "./interfaces/IGenArt721CoreContractV3_Engine_Flex_PROHIBITION.sol";
 
-import "../../../../interfaces/0.8.x/IRandomizerV2.sol";
-import "../../../../interfaces/0.8.x/IEngineRegistryV0.sol";
-import "../../../../interfaces/0.8.x/IDependencyRegistryCompatibleV0.sol";
-import "../../../../interfaces/0.8.x/IManifold.sol";
+import "../../../../interfaces/v0.8.x/IRandomizerV2.sol";
+import "../../../../interfaces/v0.8.x/IDependencyRegistryCompatibleV0.sol";
+import "../../../../interfaces/v0.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/BytecodeStorageV1.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 Flex ERC-721 core contract, V3.
@@ -271,7 +270,7 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
     bool public immutable autoApproveArtistSplitProposals;
 
     /// version & type of this core contract
-    bytes32 constant CORE_VERSION = "v3.1.3";
+    bytes32 constant CORE_VERSION = "v3.1.5";
 
     function coreVersion() external pure returns (string memory) {
         return CORE_VERSION.toString();
@@ -392,8 +391,7 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
         address _randomizerContract,
         address _adminACLContract,
         uint248 _startingProjectId,
-        bool _autoApproveArtistSplitProposals,
-        address _engineRegistryContract
+        bool _autoApproveArtistSplitProposals
     ) ERC721_PackedHashSeed(_tokenName, _tokenSymbol) {
         _onlyNonZeroAddress(_renderProviderAddress);
         _onlyNonZeroAddress(_platformProviderAddress);
@@ -424,12 +422,8 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
         // initialize next project ID
         _nextProjectId = _startingProjectId;
         emit PlatformUpdated(FIELD_NEXT_PROJECT_ID);
-        // register contract as an Engine contract
-        IEngineRegistryV0(_engineRegistryContract).registerContract(
-            address(this),
-            CORE_VERSION,
-            CORE_TYPE
-        );
+        // @dev follow-on action: This contract does not self-register. A core
+        // registry owner must register contract in a subsequent call.
     }
 
     /**
@@ -919,7 +913,10 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
         uint256 _additionalPayeeSecondarySalesPercentage
     ) external {
         _onlyValidProjectId(_projectId);
-        _onlyArtist(_projectId);
+        _onlyArtistOrAdminACL(
+            _projectId,
+            this.proposeArtistPaymentAddressesAndSplits.selector
+        );
         _onlyNonZeroAddress(_artistAddress);
         ProjectFinance storage projectFinance = projectIdToFinancials[
             _projectId
@@ -1124,6 +1121,14 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
         _onlyNonEmptyString(_projectName);
         _onlyNonZeroAddress(_artistAddress);
         require(!newProjectsForbidden, "New projects forbidden");
+        require(
+            IAdminACLV0_PROHIBITION(address(adminACLContract)).allowed(
+                msg.sender,
+                address(this),
+                this.addProject.selector
+            ),
+            "Only Admin ACL allowed"
+        );
         uint256 projectId = _nextProjectId;
         projectIdToFinancials[projectId].artistAddress = _artistAddress;
         projects[projectId].name = _projectName;
@@ -2117,13 +2122,7 @@ contract GenArt721CoreV3_Engine_Flex_PROHIBITION is
         bytes4 _selector
     ) public returns (bool) {
         return
-            owner() != address(0) &&
-            IAdminACLV0_PROHIBITION(address(adminACLContract)).allowed(
-                _sender,
-                _contract,
-                _selector,
-                type(uint256).max
-            );
+            adminACLAllowed(_sender, _contract, _selector, type(uint256).max);
     }
 
     /**

package/contracts/engine/V3/forks/PROHIBITION/interfaces/IAdminACLV0_PROHIBITION.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.0;
 
-import "../../../../../interfaces/0.8.x/IAdminACLV0.sol";
+import "../../../../../interfaces/v0.8.x/IAdminACLV0.sol";
 
 interface IAdminACLV0_PROHIBITION is IAdminACLV0 {
     /**

package/contracts/engine/V3/forks/PROHIBITION/interfaces/IGenArt721CoreContractV3_Engine_Flex_PROHIBITION.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "./IAdminACLV0_PROHIBITION.sol";
-import "../../../../../interfaces/0.8.x/IGenArt721CoreContractV3_Engine_Flex.sol";
+import "../../../../../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine_Flex.sol";
 
 /**
  * @title This interface is intended to house interface items that are common

package/contracts/engine-registry/CoreRegistryV1.sol

@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 
+// @dev fixed to specific solidity version for clarity and for more clear
+// source code verification purposes.
 pragma solidity 0.8.19;
 
-import "../interfaces/0.8.x/ICoreRegistryV1.sol";
-import "@openzeppelin-4.7/contracts/access/Ownable.sol";
-import "@openzeppelin-4.7/contracts/utils/structs/EnumerableSet.sol";
+import {ICoreRegistryV1} from "../interfaces/v0.8.x/ICoreRegistryV1.sol";
+
+import {Ownable} from "@openzeppelin-4.7/contracts/access/Ownable.sol";
+import {EnumerableSet} from "@openzeppelin-4.7/contracts/utils/structs/EnumerableSet.sol";
 
 /**
  * @title Art Blocks Core Contract Registry, V1.
@@ -57,20 +60,11 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
     using EnumerableSet for EnumerableSet.AddressSet;
 
     /// private enumerable set of registered contracts
-    EnumerableSet.AddressSet private registeredContracts;
+    EnumerableSet.AddressSet private _registeredContracts;
 
     /// private mapping of registered contract addresses to
     EnumerableSet.AddressSet
-        private registeredMinterFilterV2CompatibleContracts;
-
-    /**
-     * @notice Reverts if `tx.origin` is not the owner.
-     * @dev Warning that this check is only against tx.origin, which may be
-     * misleading when used for security.
-     */
-    function _onlyOwnerOrigin() internal view {
-        require(tx.origin == owner(), "Only tx origin of owner");
-    }
+        private _registeredMinterFilterV2CompatibleContracts;
 
     constructor() Ownable() {}
 
@@ -82,24 +76,19 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * registered.
      */
     function registerContract(
-        address _contractAddress,
-        bytes32 _coreVersion,
-        bytes32 _coreType
+        address contractAddress,
+        bytes32 coreVersion,
+        bytes32 coreType
     ) external {
         // CHECKS
-        // Validate against `tx.origin` rather than `msg.sender` as it is
-        // intended that this registration be performed in an automated
-        // fashion at the time of contract deployment of `_contractAddress`.
-        // @dev Security implications of using `tx.origin` are acknowledged
-        _onlyOwnerOrigin();
-        // only allow registration of a contract registering itself, or allow
-        // the owner to register any contract.
-        require(
-            msg.sender == _contractAddress || msg.sender == owner(),
-            "Only owner or registrant"
-        );
+        // revert if not called by owner
+        Ownable._checkOwner();
         // EFFECTS
-        _registerContract(_contractAddress, _coreVersion, _coreType);
+        _registerContract({
+            contractAddress: contractAddress,
+            coreVersion: coreVersion,
+            coreType: coreType
+        });
     }
 
     /**
@@ -108,12 +97,12 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * Reverts if authorization fails, or if the contract is not already
      * registered.
      */
-    function unregisterContract(address _contractAddress) external {
+    function unregisterContract(address contractAddress) external {
         // CHECKS
         // revert if not called by owner
         Ownable._checkOwner();
         // EFFECTS
-        _unregisterContract(_contractAddress);
+        _unregisterContract(contractAddress);
     }
 
     /**
@@ -122,32 +111,32 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * Reverts if any contract is already registered.
      * @dev This should primarily be used for backfilling the registry with
      * existing contracts shortly after deployment.
-     * @param _contractAddresses Array of contract addresses to register.
-     * @param _coreVersions Array of core versions for each contract (aligned).
-     * @param _coreTypes Array of core types for each contract (aligned).
+     * @param contractAddresses Array of contract addresses to register.
+     * @param coreVersions Array of core versions for each contract (aligned).
+     * @param coreTypes Array of core types for each contract (aligned).
      */
     function registerContracts(
-        address[] calldata _contractAddresses,
-        bytes32[] calldata _coreVersions,
-        bytes32[] calldata _coreTypes
+        address[] calldata contractAddresses,
+        bytes32[] calldata coreVersions,
+        bytes32[] calldata coreTypes
     ) external {
         // CHECKS
         // revert if not called by owner
         Ownable._checkOwner();
         // validate same length arrays
-        uint256 numContracts = _contractAddresses.length;
+        uint256 numContracts = contractAddresses.length;
         require(
-            numContracts == _coreVersions.length &&
-                numContracts == _coreTypes.length,
+            numContracts == coreVersions.length &&
+                numContracts == coreTypes.length,
             "Mismatched array lengths"
         );
         // EFFECTS
         for (uint256 i = 0; i < numContracts; ) {
-            _registerContract(
-                _contractAddresses[i],
-                _coreVersions[i],
-                _coreTypes[i]
-            );
+            _registerContract({
+                contractAddress: contractAddresses[i],
+                coreVersion: coreVersions[i],
+                coreType: coreTypes[i]
+            });
             unchecked {
                 ++i;
             }
@@ -158,18 +147,18 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * @notice Unregister multiple contracts at once.
      * Only callable by the owner.
      * Reverts if any contract is not already registered.
-     * @param _contractAddresses Array of contract addresses to unregister.
+     * @param contractAddresses Array of contract addresses to unregister.
      */
     function unregisterContracts(
-        address[] calldata _contractAddresses
+        address[] calldata contractAddresses
     ) external {
         // CHECKS
         // revert if not called by owner
         Ownable._checkOwner();
         // EFFECTS
-        uint256 numContracts = _contractAddresses.length;
+        uint256 numContracts = contractAddresses.length;
         for (uint256 i = 0; i < numContracts; ) {
-            _unregisterContract(_contractAddresses[i]);
+            _unregisterContract(contractAddresses[i]);
             unchecked {
                 ++i;
             }
@@ -181,18 +170,18 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * @return The number of registered contracts.
      */
     function getNumRegisteredContracts() external view returns (uint256) {
-        return registeredContracts.length();
+        return _registeredContracts.length();
     }
 
     /**
      * @notice Get the address of a registered contract by index.
-     * @param _index The index of the contract to get.
+     * @param index The index of the contract to get.
      * @return The address of the contract at the given index.
      */
     function getRegisteredContractAt(
-        uint256 _index
+        uint256 index
     ) external view returns (address) {
-        return registeredContracts.at(_index);
+        return _registeredContracts.at(index);
     }
 
     /**
@@ -207,19 +196,19 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
         view
         returns (address[] memory)
     {
-        return registeredContracts.values();
+        return _registeredContracts.values();
     }
 
     /**
      * @notice Returns boolean representing if contract is registered on this
      * registry.
-     * @param _contractAddress The address of the contract to check.
+     * @param contractAddress The address of the contract to check.
      * @return isRegistered True if the contract is registered.
      */
     function isRegisteredContract(
-        address _contractAddress
+        address contractAddress
     ) external view returns (bool isRegistered) {
-        return registeredContracts.contains(_contractAddress);
+        return _registeredContracts.contains(contractAddress);
     }
 
     /**
@@ -227,28 +216,32 @@ contract CoreRegistryV1 is Ownable, ICoreRegistryV1 {
      * Reverts if the contract is already registered.
      */
     function _registerContract(
-        address _contractAddress,
-        bytes32 _coreVersion,
-        bytes32 _coreType
+        address contractAddress,
+        bytes32 coreVersion,
+        bytes32 coreType
     ) internal {
         // @dev add returns true only if not already registered
         require(
-            registeredContracts.add(_contractAddress),
+            _registeredContracts.add(contractAddress),
             "Contract already registered"
         );
-        emit ContractRegistered(_contractAddress, _coreVersion, _coreType);
+        emit ContractRegistered({
+            _contractAddress: contractAddress,
+            _coreVersion: coreVersion,
+            _coreType: coreType
+        });
     }
 
     /**
      * @notice Internal function to unregister a contract.
      * Reverts if the contract is not already registered.
      */
-    function _unregisterContract(address _contractAddress) internal {
+    function _unregisterContract(address contractAddress) internal {
         // @dev remove returns true only if already in set
         require(
-            registeredContracts.remove(_contractAddress),
+            _registeredContracts.remove(contractAddress),
             "Only registered contracts"
         );
-        emit ContractUnregistered(_contractAddress);
+        emit ContractUnregistered({_contractAddress: contractAddress});
     }
 }

package/contracts/engine-registry/EngineRegistryV0.sol

@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.19;
 
-import "../interfaces/0.8.x/IEngineRegistryV0.sol";
+import "../interfaces/v0.8.x/IEngineRegistryV0.sol";
 import "@openzeppelin-4.7/contracts/utils/introspection/ERC165.sol";
 
 /**