@artblocks/contracts 1.1.0 → 1.2.0

package/contracts/DependencyRegistryV0.sol

@@ -13,6 +13,7 @@ import "@openzeppelin-4.8/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin-4.8/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin-4.5/contracts/utils/math/SafeCast.sol";
 
+import "./libs/v0.8.x/DependencyRegistryStorageLib.sol";
 import "./libs/v0.8.x/BytecodeStorageV1.sol";
 import "./libs/v0.8.x/Bytes32Strings.sol";
 
@@ -21,7 +22,7 @@ import "./libs/v0.8.x/Bytes32Strings.sol";
  * @author Art Blocks Inc.
  * @notice Privileged Roles and Ownership:
  * Permissions managed by ACL contract. If/when we ever call
- * renounceOwnership() this will becom a frozen, immutable registry
+ * renounceOwnership() this will become a frozen, immutable registry
  * as no upgrades will be possible.
  * This contract is intended to be an auxiliary reference registry
  * to our non-upgradeable and immutable ERC-721 conforming core contracts,
@@ -42,157 +43,152 @@ contract DependencyRegistryV0 is
 
     uint8 constant AT_CHARACTER_CODE = uint8(bytes1("@")); // 0x40
 
-    /// admin ACL contract
-    IAdminACLV0 public adminACLContract;
-
-    struct Dependency {
-        bytes32 licenseType;
-        string preferredCDN;
-        // mapping from additional CDN index to CDN URLr
-        mapping(uint256 => string) additionalCDNs;
-        string preferredRepository;
-        // mapping from additional repository index to repository URL
-        mapping(uint256 => string) additionalRepositories;
-        string referenceWebsite;
-        // mapping from script index to address storing script in bytecode
-        mapping(uint256 => address) scriptBytecodeAddresses;
-        uint24 additionalCDNCount;
-        uint24 additionalRepositoryCount;
-        uint24 scriptCount;
-    }
-
-    // dependency types, i.e. "type@version"
-    EnumerableSet.Bytes32Set private _dependencyTypes;
-    // mapping from dependencyTypes to Dependency, which stores the properties of each dependency
-    mapping(bytes32 => Dependency) dependencyDetails;
-    // source code license types, MIT, GPL, etc.
-    EnumerableSet.Bytes32Set private _licenseTypes;
-
-    // set of supported core ArtBlocks contracts
-    EnumerableSet.AddressSet private _supportedCoreContracts;
-    mapping(address => mapping(uint256 => bytes32)) projectDependencyTypeOverrides;
-
-    function _onlyNonZeroAddress(address _address) internal pure {
-        require(_address != address(0), "Must input non-zero address");
+    function _onlyNonZeroAddress(address address_) internal pure {
+        require(address_ != address(0), "Must input non-zero address");
     }
 
-    function _onlyNonEmptyString(string memory _string) internal pure {
-        require(bytes(_string).length != 0, "Must input non-empty string");
+    function _onlyNonEmptyString(string memory string_) internal pure {
+        require(bytes(string_).length != 0, "Must input non-empty string");
     }
 
-    function _onlyAdminACL(bytes4 _selector) internal {
+    function _onlyAdminACL(bytes4 selector) internal {
         require(
-            adminACLAllowed(msg.sender, address(this), _selector),
+            adminACLAllowed({
+                sender: msg.sender,
+                contract_: address(this),
+                selector: selector
+            }),
             "Only Admin ACL allowed"
         );
     }
 
     function _onlySupportedCoreContract(
-        address _coreContractAddress
+        address coreContractAddress
     ) internal view {
         require(
-            _supportedCoreContracts.contains(_coreContractAddress),
+            DependencyRegistryStorageLib.s().supportedCoreContracts.contains(
+                coreContractAddress
+            ),
             "Core contract not supported"
         );
     }
 
-    function _onlyExistingDependencyType(
-        bytes32 _dependencyType
+    function _onlyExistingDependency(
+        bytes32 dependencyNameAndVersion
     ) internal view {
         require(
-            _dependencyTypes.contains(_dependencyType),
-            "Dependency type does not exist"
+            DependencyRegistryStorageLib.s().dependencyNameVersionIds.contains(
+                dependencyNameAndVersion
+            ),
+            "Dependency does not exist"
         );
     }
 
-    function _onlyInRangeIndex(uint256 _index, uint256 _length) internal pure {
-        require(_index < _length, "Index out of range");
+    function _onlyInRangeIndex(uint256 index, uint256 length) internal pure {
+        require(index < length, "Index out of range");
     }
 
-    function _onlyExistingLicenseType(bytes32 _licenseType) internal view {
+    function _onlyExistingLicenseType(bytes32 licenseType) internal view {
         require(
-            _licenseTypes.contains(_licenseType),
+            DependencyRegistryStorageLib.s().licenseTypes.contains(licenseType),
             "License type does not exist"
         );
     }
 
     /**
      * @notice Initializes contract.
-     * @param _adminACLContract Address of admin access control contract, to be
+     * @param adminACLContract_ Address of admin access control contract, to be
      * set as contract owner.
      */
-    function initialize(address _adminACLContract) public initializer {
+    function initialize(address adminACLContract_) public initializer {
         __Ownable_init();
+
         // set AdminACL management contract as owner
-        _transferOwnership(_adminACLContract);
+        _transferOwnership(adminACLContract_);
     }
 
     /**
      * @notice Adds a new license type that can be used by dependencies.
+     * @param licenseType License type to be added.
      */
-    function addLicenseType(bytes32 _licenseType) external {
+    function addLicenseType(bytes32 licenseType) external {
         _onlyAdminACL(this.addLicenseType.selector);
-        // @dev the add function returns false if set already contains value
-        require(_licenseTypes.add(_licenseType), "License type already exists");
         require(
-            _licenseType != bytes32(""),
+            licenseType != bytes32(""),
             "License type cannot be empty string"
         );
-        emit LicenseTypeAdded(_licenseType);
+
+        // @dev the add function returns false if set already contains value
+        require(
+            DependencyRegistryStorageLib.s().licenseTypes.add(licenseType),
+            "License type already exists"
+        );
+        emit LicenseTypeAdded(licenseType);
     }
 
     /**
      * @notice Adds a new dependency.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _licenseType License type for dependency, must be a registered license type.
-     * @param _preferredCDN Preferred CDN for dependency.
-     * @param _preferredRepository Preferred repository for dependency.
+     * @param dependencyNameAndVersion A unique identifier for the dependency, composed of its name and version in the format "name@version".
+     * @param licenseType License type for dependency, must be a registered license type.
+     * @param preferredCDN Preferred CDN for dependency.
+     * @param preferredRepository Preferred repository for dependency.
      */
     function addDependency(
-        bytes32 _dependencyType,
-        bytes32 _licenseType,
-        string memory _preferredCDN,
-        string memory _preferredRepository,
-        string memory _referenceWebsite
+        bytes32 dependencyNameAndVersion,
+        bytes32 licenseType,
+        string memory preferredCDN,
+        string memory preferredRepository,
+        string memory dependencyWebsite
     ) external {
         _onlyAdminACL(this.addDependency.selector);
-        _onlyExistingLicenseType(_licenseType);
+        _onlyExistingLicenseType(licenseType);
         require(
-            _dependencyType.containsExactCharacterQty(
+            dependencyNameAndVersion.containsExactCharacterQty(
                 AT_CHARACTER_CODE,
                 uint8(1)
             ),
             "must contain exactly one @"
         );
+
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
         require(
             // @dev the add function returns false if set already contains value
-            _dependencyTypes.add(_dependencyType),
-            "Dependency type already exists"
+            ds.dependencyNameVersionIds.add(dependencyNameAndVersion),
+            "Dependency already exists"
         );
 
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        dependency.licenseType = _licenseType;
-        dependency.preferredCDN = _preferredCDN;
-        dependency.preferredRepository = _preferredRepository;
-        dependency.referenceWebsite = _referenceWebsite;
+        DependencyRegistryStorageLib.Dependency storage dependency = ds
+            .dependencyRecords[dependencyNameAndVersion];
+        dependency.licenseType = licenseType;
+        dependency.preferredCDN = preferredCDN;
+        dependency.preferredRepository = preferredRepository;
+        dependency.website = dependencyWebsite;
 
         emit DependencyAdded(
-            _dependencyType,
-            _licenseType,
-            _preferredCDN,
-            _preferredRepository,
-            _referenceWebsite
+            dependencyNameAndVersion,
+            licenseType,
+            preferredCDN,
+            preferredRepository,
+            dependencyWebsite
         );
     }
 
     /**
      * @notice Removes a dependency.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
      */
-    function removeDependency(bytes32 _dependencyType) external {
+    function removeDependency(bytes32 dependencyNameAndVersion) external {
         _onlyAdminACL(this.removeDependency.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        DependencyRegistryStorageLib.Dependency storage dependency = ds
+            .dependencyRecords[dependencyNameAndVersion];
+
         require(
             dependency.additionalCDNCount == 0 &&
                 dependency.additionalRepositoryCount == 0 &&
@@ -200,115 +196,139 @@ contract DependencyRegistryV0 is
             "Cannot remove dependency with additional CDNs, repositories, or scripts"
         );
 
-        _dependencyTypes.remove(_dependencyType);
-        delete dependencyDetails[_dependencyType];
+        ds.dependencyNameVersionIds.remove(dependencyNameAndVersion);
+        // @dev all of the arrays in the dependency struct are required to be empty
+        // before this function can be called, so we don't need to delete them here
+        delete ds.dependencyRecords[dependencyNameAndVersion];
 
-        emit DependencyRemoved(_dependencyType);
+        emit DependencyRemoved(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Adds a script to dependency `_dependencyType`, by way of
+     * @notice Adds a script to dependency `dependencyNameAndVersion`, by way of
      *         providing a string to write to bytecode storage.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _script Script to be added. Required to be a non-empty string,
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param script Script to be added. Required to be a non-empty string,
      *                but no further validation is performed.
      */
     function addDependencyScript(
-        bytes32 _dependencyType,
-        string memory _script
+        bytes32 dependencyNameAndVersion,
+        string memory script
     ) external {
         _onlyAdminACL(this.addDependencyScript.selector);
-        _onlyNonEmptyString(_script);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonEmptyString(script);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         // store script in contract bytecode
-        dependency.scriptBytecodeAddresses[dependency.scriptCount] = _script
+        dependency.scriptBytecodeAddresses[dependency.scriptCount] = script
             .writeToBytecode();
         dependency.scriptCount = dependency.scriptCount + 1;
 
-        emit DependencyScriptUpdated(_dependencyType);
+        emit DependencyScriptUpdated(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Updates script for dependencyType `_dependencyType` at script `_index`,
+     * @notice Updates script for dependencyType `dependencyNameAndVersion` at script `index`,
      *         by way of providing a string to write to bytecode storage.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of a given script, relative to the overall `scriptCount`.
-     * @param _script The updated script value. Required to be a non-empty
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of a given script, relative to the overall `scriptCount`.
+     * @param script The updated script value. Required to be a non-empty
      *                string, but no further validation is performed.
      */
     function updateDependencyScript(
-        bytes32 _dependencyType,
-        uint256 _index,
-        string memory _script
+        bytes32 dependencyNameAndVersion,
+        uint256 index,
+        string memory script
     ) external {
         _onlyAdminACL(this.updateDependencyScript.selector);
-        _onlyNonEmptyString(_script);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
+        _onlyNonEmptyString(script);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
+        _onlyInRangeIndex({index: index, length: dependency.scriptCount});
         // store script in contract bytecode, replacing reference address from
         // the contract that no longer exists with the newly created one
-        dependency.scriptBytecodeAddresses[_index] = _script.writeToBytecode();
+        dependency.scriptBytecodeAddresses[index] = script.writeToBytecode();
 
-        emit DependencyScriptUpdated(_dependencyType);
+        emit DependencyScriptUpdated(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Adds a script to dependency `_dependencyType`, by way of
+     * @notice Adds a script to dependency `dependencyNameAndVersion`, by way of
      *         providing an already written chunk of bytecode storage.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _scriptPointer Address of script to be added. Required to be a non-zero address,
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param scriptPointer Address of script to be added. Required to be a non-zero address,
      *                       but no further validation is performed.
      */
     function addDependencyScriptPointer(
-        bytes32 _dependencyType,
-        address _scriptPointer
+        bytes32 dependencyNameAndVersion,
+        address scriptPointer
     ) external {
         _onlyAdminACL(this.addDependencyScriptPointer.selector);
-        _onlyNonZeroAddress(_scriptPointer);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonZeroAddress(scriptPointer);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         // store script in contract bytecode
         dependency.scriptBytecodeAddresses[
             dependency.scriptCount
-        ] = _scriptPointer;
+        ] = scriptPointer;
         dependency.scriptCount = dependency.scriptCount + 1;
 
-        emit DependencyScriptUpdated(_dependencyType);
+        emit DependencyScriptUpdated(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Updates script for dependencyType `_dependencyType` at script `_index`,
+     * @notice Updates script for dependency id `dependencyNameAndVersion` at script `index`,
      *         by way of providing an already written chunk of bytecode storage.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of a given script, relative to the overall `scriptCount`.
-     * @param _scriptPointer The updated script pointer (address of bytecode storage).
+     * @param dependencyNameAndVersion Name of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of a given script, relative to the overall `scriptCount`.
+     * @param scriptPointer The updated script pointer (address of bytecode storage).
      *                       Required to be a non-zero address, but no further validation is performed.
      */
     function updateDependencyScriptPointer(
-        bytes32 _dependencyType,
-        uint256 _index,
-        address _scriptPointer
+        bytes32 dependencyNameAndVersion,
+        uint256 index,
+        address scriptPointer
     ) external {
         _onlyAdminACL(this.updateDependencyScriptPointer.selector);
-        _onlyNonZeroAddress(_scriptPointer);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
-        dependency.scriptBytecodeAddresses[_index] = _scriptPointer;
+        _onlyNonZeroAddress(scriptPointer);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
+        _onlyInRangeIndex({index: index, length: dependency.scriptCount});
+        dependency.scriptBytecodeAddresses[index] = scriptPointer;
 
-        emit DependencyScriptUpdated(_dependencyType);
+        emit DependencyScriptUpdated(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Removes last script from dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
+     * @notice Removes last script from dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
      */
-    function removeDependencyLastScript(bytes32 _dependencyType) external {
+    function removeDependencyLastScript(
+        bytes32 dependencyNameAndVersion
+    ) external {
         _onlyAdminACL(this.removeDependencyLastScript.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         require(dependency.scriptCount > 0, "there are no scripts to remove");
         // delete reference to old storage contract address
         delete dependency.scriptBytecodeAddresses[dependency.scriptCount - 1];
@@ -316,365 +336,438 @@ contract DependencyRegistryV0 is
             dependency.scriptCount = dependency.scriptCount - 1;
         }
 
-        emit DependencyScriptUpdated(_dependencyType);
+        emit DependencyScriptUpdated(dependencyNameAndVersion);
     }
 
     /**
-     * @notice Updates preferred CDN for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _preferredCDN URL for preferred CDN.
+     * @notice Updates preferred CDN for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param preferredCDN URL for preferred CDN.
      */
     function updateDependencyPreferredCDN(
-        bytes32 _dependencyType,
-        string memory _preferredCDN
+        bytes32 dependencyNameAndVersion,
+        string memory preferredCDN
     ) external {
         _onlyAdminACL(this.updateDependencyPreferredCDN.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        dependencyDetails[_dependencyType].preferredCDN = _preferredCDN;
+        _onlyExistingDependency(dependencyNameAndVersion);
 
-        emit DependencyPreferredCDNUpdated(_dependencyType, _preferredCDN);
+        DependencyRegistryStorageLib
+            .s()
+            .dependencyRecords[dependencyNameAndVersion]
+            .preferredCDN = preferredCDN;
+
+        emit DependencyPreferredCDNUpdated(
+            dependencyNameAndVersion,
+            preferredCDN
+        );
     }
 
     /**
-     * @notice Updates preferred repository for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _preferredRepository URL for preferred repository.
+     * @notice Updates preferred repository for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param preferredRepository URL for preferred repository.
      */
     function updateDependencyPreferredRepository(
-        bytes32 _dependencyType,
-        string memory _preferredRepository
+        bytes32 dependencyNameAndVersion,
+        string memory preferredRepository
     ) external {
         _onlyAdminACL(this.updateDependencyPreferredRepository.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        dependencyDetails[_dependencyType]
-            .preferredRepository = _preferredRepository;
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib
+            .s()
+            .dependencyRecords[dependencyNameAndVersion]
+            .preferredRepository = preferredRepository;
 
         emit DependencyPreferredRepositoryUpdated(
-            _dependencyType,
-            _preferredRepository
+            dependencyNameAndVersion,
+            preferredRepository
         );
     }
 
     /**
-     * @notice Updates project website for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _referenceWebsite URL for project website.
+     * @notice Updates project website for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param dependencyWebsite URL for project website.
      */
-    function updateDependencyReferenceWebsite(
-        bytes32 _dependencyType,
-        string memory _referenceWebsite
+    function updateDependencyWebsite(
+        bytes32 dependencyNameAndVersion,
+        string memory dependencyWebsite
     ) external {
-        _onlyAdminACL(this.updateDependencyReferenceWebsite.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        dependencyDetails[_dependencyType].referenceWebsite = _referenceWebsite;
+        _onlyAdminACL(this.updateDependencyWebsite.selector);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib
+            .s()
+            .dependencyRecords[dependencyNameAndVersion]
+            .website = dependencyWebsite;
 
-        emit DependencyReferenceWebsiteUpdated(
-            _dependencyType,
-            _referenceWebsite
+        emit DependencyWebsiteUpdated(
+            dependencyNameAndVersion,
+            dependencyWebsite
         );
     }
 
     /**
-     * @notice Adds a new CDN url to `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _additionalCDN CDN URL to be added. Required to be a non-empty string,
+     * @notice Adds a new CDN url to `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param additionalCDN CDN URL to be added. Required to be a non-empty string,
      *                       but no further validation is performed.
      */
     function addDependencyAdditionalCDN(
-        bytes32 _dependencyType,
-        string memory _additionalCDN
+        bytes32 dependencyNameAndVersion,
+        string memory additionalCDN
     ) external {
         _onlyAdminACL(this.addDependencyAdditionalCDN.selector);
-        _onlyNonEmptyString(_additionalCDN);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonEmptyString(additionalCDN);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
 
         uint256 additionalCDNCount = uint256(dependency.additionalCDNCount);
-        dependency.additionalCDNs[additionalCDNCount] = _additionalCDN;
+        dependency.additionalCDNs[additionalCDNCount] = additionalCDN;
         dependency.additionalCDNCount = uint24(additionalCDNCount + 1);
 
         emit DependencyAdditionalCDNUpdated(
-            _dependencyType,
-            _additionalCDN,
+            dependencyNameAndVersion,
+            additionalCDN,
             additionalCDNCount
         );
     }
 
     /**
-     * @notice Removes additional CDN for dependency `_dependencyId` at index `_index`.
+     * @notice Removes additional CDN for dependency `_dependencyId` at index `index`.
      * Removal is done by swapping the element to be removed with the last element in the array, then deleting this last element.
-     * Assets with indices higher than `_index` can have their indices adjusted as a result of this operation.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional CDN, relative to the overall `additionalCDNCount`.
+     * Assets with indices higher than `index` can have their indices adjusted as a result of this operation.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional CDN, relative to the overall `additionalCDNCount`.
      */
     function removeDependencyAdditionalCDN(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external {
         _onlyAdminACL(this.removeDependencyAdditionalCDN.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
 
         uint256 additionalCDNCount = dependency.additionalCDNCount;
-        _onlyInRangeIndex({_index: _index, _length: additionalCDNCount});
+        _onlyInRangeIndex({index: index, length: additionalCDNCount});
 
         uint256 lastElementIndex = additionalCDNCount - 1;
 
-        dependency.additionalCDNs[_index] = dependency.additionalCDNs[
+        dependency.additionalCDNs[index] = dependency.additionalCDNs[
             lastElementIndex
         ];
         delete dependency.additionalCDNs[lastElementIndex];
 
         dependency.additionalCDNCount = uint24(lastElementIndex);
 
-        emit DependencyAdditionalCDNRemoved(_dependencyType, _index);
+        emit DependencyAdditionalCDNRemoved(dependencyNameAndVersion, index);
     }
 
     /**
-     * @notice Updates additional CDN for dependency `_dependencyType` at `_index`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional CDN, relative to the overall `additionalCDNCount`.
-     * @param _additionalCDN New CDN URL.
+     * @notice Updates additional CDN for dependency `dependencyNameAndVersion` at `index`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional CDN, relative to the overall `additionalCDNCount`.
+     * @param additionalCDN New CDN URL.
      */
     function updateDependencyAdditionalCDN(
-        bytes32 _dependencyType,
-        uint256 _index,
-        string memory _additionalCDN
+        bytes32 dependencyNameAndVersion,
+        uint256 index,
+        string memory additionalCDN
     ) external {
         _onlyAdminACL(this.updateDependencyAdditionalCDN.selector);
-        _onlyNonEmptyString(_additionalCDN);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonEmptyString(additionalCDN);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         _onlyInRangeIndex({
-            _index: _index,
-            _length: dependency.additionalCDNCount
+            index: index,
+            length: dependency.additionalCDNCount
         });
 
-        dependency.additionalCDNs[_index] = _additionalCDN;
+        dependency.additionalCDNs[index] = additionalCDN;
 
         emit DependencyAdditionalCDNUpdated(
-            _dependencyType,
-            _additionalCDN,
-            _index
+            dependencyNameAndVersion,
+            additionalCDN,
+            index
         );
     }
 
     /**
-     * @notice Adds a new repository URL to dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _additionalRepository Repository URL to be added. Required to be a non-empty string,
+     * @notice Adds a new repository URL to dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param additionalRepository Repository URL to be added. Required to be a non-empty string,
      * but no further validation is performed.
      */
     function addDependencyAdditionalRepository(
-        bytes32 _dependencyType,
-        string memory _additionalRepository
+        bytes32 dependencyNameAndVersion,
+        string memory additionalRepository
     ) external {
         _onlyAdminACL(this.addDependencyAdditionalRepository.selector);
-        _onlyNonEmptyString(_additionalRepository);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonEmptyString(additionalRepository);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         uint256 additionalRepositoryCount = uint256(
             dependency.additionalRepositoryCount
         );
         dependency.additionalRepositories[
             additionalRepositoryCount
-        ] = _additionalRepository;
+        ] = additionalRepository;
         dependency.additionalRepositoryCount = uint24(
             additionalRepositoryCount + 1
         );
 
         emit DependencyAdditionalRepositoryUpdated(
-            _dependencyType,
-            _additionalRepository,
+            dependencyNameAndVersion,
+            additionalRepository,
             additionalRepositoryCount
         );
     }
 
     /**
-     * @notice Removes additional repository for depenency `_dependencyId` at index `_index`.
+     * @notice Removes additional repository for depenency `_dependencyId` at index `index`.
      * Removal is done by swapping the element to be removed with the last element in the array, then deleting this last element.
-     * Assets with indices higher than `_index` can have their indices adjusted as a result of this operation.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
+     * Assets with indices higher than `index` can have their indices adjusted as a result of this operation.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
      */
     function removeDependencyAdditionalRepository(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external {
         _onlyAdminACL(this.removeDependencyAdditionalRepository.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        DependencyRegistryStorageLib.Dependency storage dependency = ds
+            .dependencyRecords[dependencyNameAndVersion];
         uint256 additionalRepositoryCount = dependency
             .additionalRepositoryCount;
-        _onlyInRangeIndex({_index: _index, _length: additionalRepositoryCount});
+        _onlyInRangeIndex({index: index, length: additionalRepositoryCount});
 
         uint256 lastElementIndex = additionalRepositoryCount - 1;
 
-        dependency.additionalRepositories[_index] = dependencyDetails[
-            _dependencyType
-        ].additionalRepositories[lastElementIndex];
+        dependency.additionalRepositories[index] = ds
+            .dependencyRecords[dependencyNameAndVersion]
+            .additionalRepositories[lastElementIndex];
         delete dependency.additionalRepositories[lastElementIndex];
 
         dependency.additionalRepositoryCount = uint24(lastElementIndex);
 
-        emit DependencyAdditionalRepositoryRemoved(_dependencyType, _index);
+        emit DependencyAdditionalRepositoryRemoved(
+            dependencyNameAndVersion,
+            index
+        );
     }
 
     /**
-     * @notice Updates additional repository for dependency `_dependencyType` at `_index`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
-     * @param _additionalRepository New Repository URL.
+     * @notice Updates additional repository for dependency `dependencyNameAndVersion` at `index`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
+     * @param additionalRepository New Repository URL.
      */
     function updateDependencyAdditionalRepository(
-        bytes32 _dependencyType,
-        uint256 _index,
-        string memory _additionalRepository
+        bytes32 dependencyNameAndVersion,
+        uint256 index,
+        string memory additionalRepository
     ) external {
         _onlyAdminACL(this.updateDependencyAdditionalRepository.selector);
-        _onlyNonEmptyString(_additionalRepository);
-        _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyNonEmptyString(additionalRepository);
+        _onlyExistingDependency(dependencyNameAndVersion);
+
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         _onlyInRangeIndex({
-            _index: _index,
-            _length: dependency.additionalRepositoryCount
+            index: index,
+            length: dependency.additionalRepositoryCount
         });
 
-        dependency.additionalRepositories[_index] = _additionalRepository;
+        dependency.additionalRepositories[index] = additionalRepository;
 
         emit DependencyAdditionalRepositoryUpdated(
-            _dependencyType,
-            _additionalRepository,
-            _index
+            dependencyNameAndVersion,
+            additionalRepository,
+            index
         );
     }
 
     /**
      * @notice Adds a new core contract to the list of supported core contracts.
-     * @param _contractAddress Address of the core contract to be added.
+     * @param contractAddress Address of the core contract to be added.
      */
-    function addSupportedCoreContract(address _contractAddress) external {
+    function addSupportedCoreContract(address contractAddress) external {
         _onlyAdminACL(this.addSupportedCoreContract.selector);
-        _onlyNonZeroAddress(_contractAddress);
+        _onlyNonZeroAddress(contractAddress);
+
         require(
             // @dev the add function returns false if set already contains value
-            _supportedCoreContracts.add(_contractAddress),
+            DependencyRegistryStorageLib.s().supportedCoreContracts.add(
+                contractAddress
+            ),
             "Contract already supported"
         );
-        emit SupportedCoreContractAdded(_contractAddress);
+        emit SupportedCoreContractAdded(contractAddress);
     }
 
     /**
      * @notice Removes a core contract from the list of supported core contracts.
-     * @param _contractAddress Address of the core contract to be removed.
+     * @param contractAddress Address of the core contract to be removed.
      */
-    function removeSupportedCoreContract(address _contractAddress) external {
+    function removeSupportedCoreContract(address contractAddress) external {
         _onlyAdminACL(this.removeSupportedCoreContract.selector);
         require(
             // @dev the remove function returns false if set does not contain value
-            _supportedCoreContracts.remove(_contractAddress),
+            DependencyRegistryStorageLib.s().supportedCoreContracts.remove(
+                contractAddress
+            ),
             "Core contract already removed or not in set"
         );
-        emit SupportedCoreContractRemoved(_contractAddress);
+        emit SupportedCoreContractRemoved(contractAddress);
     }
 
     /**
      * @notice Overrides the script type and version that
      * would be returned by the core contract (`_contractAddress`)
      * for a given project  (`projectId`) with the given dependency
-     * type (`_dependencyType`).
-     * @param _contractAddress Core contract address.
-     * @param _projectId Project to override script type and version for.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     */
-    function addProjectDependencyTypeOverride(
-        address _contractAddress,
-        uint256 _projectId,
-        bytes32 _dependencyType
+     * name and version (`dependencyNameAndVersion`).
+     * @param contractAddress Core contract address.
+     * @param projectId Project to override script type and version for.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "type`@`version") used to identify dependency.
+     */
+    function addProjectDependencyOverride(
+        address contractAddress,
+        uint256 projectId,
+        bytes32 dependencyNameAndVersion
     ) external {
-        _onlyAdminACL(this.addProjectDependencyTypeOverride.selector);
-        _onlyExistingDependencyType(_dependencyType);
-        _onlySupportedCoreContract(_contractAddress);
-        projectDependencyTypeOverrides[_contractAddress][
-            _projectId
-        ] = _dependencyType;
-
-        emit ProjectDependencyTypeOverrideAdded(
-            _contractAddress,
-            _projectId,
-            _dependencyType
+        _onlyAdminACL(this.addProjectDependencyOverride.selector);
+        _onlyExistingDependency(dependencyNameAndVersion);
+        _onlySupportedCoreContract(contractAddress);
+
+        DependencyRegistryStorageLib.s().projectDependencyOverrides[
+            contractAddress
+        ][projectId] = dependencyNameAndVersion;
+
+        emit ProjectDependencyOverrideAdded(
+            contractAddress,
+            projectId,
+            dependencyNameAndVersion
         );
     }
 
     /**
      * @notice Removes the script type and version override for a given
      * project (`projectId`) on a given core contract (`_contractAddress`).
-     * @param _contractAddress Core contract address.
-     * @param _projectId Project to remove override for.
+     * @param contractAddress Core contract address.
+     * @param projectId Project to remove override for.
      */
-    function removeProjectDependencyTypeOverride(
-        address _contractAddress,
-        uint256 _projectId
+    function removeProjectDependencyOverride(
+        address contractAddress,
+        uint256 projectId
     ) external {
-        _onlyAdminACL(this.removeProjectDependencyTypeOverride.selector);
+        _onlyAdminACL(this.removeProjectDependencyOverride.selector);
+
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
         require(
-            projectDependencyTypeOverrides[_contractAddress][_projectId] !=
+            ds.projectDependencyOverrides[contractAddress][projectId] !=
                 bytes32(""),
             "No override set for project"
         );
 
-        delete projectDependencyTypeOverrides[_contractAddress][_projectId];
+        delete ds.projectDependencyOverrides[contractAddress][projectId];
 
-        emit ProjectDependencyTypeOverrideRemoved(_contractAddress, _projectId);
+        emit ProjectDependencyOverrideRemoved(contractAddress, projectId);
     }
 
     /**
-     * @notice Returns a list of registered depenency types.
-     * @return List of registered depenency types.
-     * @dev This is only intended to be called outside of block
-     * execution where there is no gas limit.
+     * @notice Returns an array of strings representing all registered dependencies in the contract.
+     * Each string is a combination of the dependency's name and version
+     * @dev This function is designed to be called outside of block execution where there is no gas limit,
+     * as it may consume a large amount of gas when there are many registered dependencies.
+     * @return A string array where each element is a registered dependency in the format "name@version".
      */
-    function getDependencyTypes() external view returns (string[] memory) {
-        uint256 numDependencyTypes = _dependencyTypes.length();
-        string[] memory dependencyTypes = new string[](numDependencyTypes);
+    function getDependencyNamesAndVersions()
+        external
+        view
+        returns (string[] memory)
+    {
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
 
-        for (uint256 i = 0; i < numDependencyTypes; i++) {
-            dependencyTypes[i] = _dependencyTypes.at(i).toString();
+        uint256 numDependencies = ds.dependencyNameVersionIds.length();
+        string[] memory dependencyTypes = new string[](numDependencies);
+
+        for (uint256 i = 0; i < numDependencies; i++) {
+            dependencyTypes[i] = ds.dependencyNameVersionIds.at(i).toString();
         }
         return dependencyTypes;
     }
 
     /**
-     * @notice Returns number of registered dependency types
+     * @notice Returns number of registered dependencies
      * @return Number of registered dependencies.
      */
-    function getDependencyTypeCount() external view returns (uint256) {
-        return _dependencyTypes.length();
+    function getDependencyCount() external view returns (uint256) {
+        return
+            DependencyRegistryStorageLib.s().dependencyNameVersionIds.length();
     }
 
     /**
-     * @notice Returns registered depenedency type at index `_index`.
-     * @return Registered dependency at `_index`, relative to the overall length of the dependency type set.
+     * @notice Returns registered depenedency name and version at index `index`.
+     * @return Registered dependency at `index`, relative to the overall length of the dependency type set.
      */
-    function getDependencyType(
-        uint256 _index
+    function getDependencyNameAndVersion(
+        uint256 index
     ) external view returns (string memory) {
-        _onlyInRangeIndex({_index: _index, _length: _dependencyTypes.length()});
-        return _dependencyTypes.at(_index).toString();
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        _onlyInRangeIndex({
+            index: index,
+            length: ds.dependencyNameVersionIds.length()
+        });
+        return ds.dependencyNameVersionIds.at(index).toString();
     }
 
     /**
-     * @notice Returns number of registered license types
-     * @return Number of registered license types.
+     * @notice Returns array of registered license types
+     * @return Array of registered license types.
      * @dev This is only intended to be called outside of block
      * execution where there is no gas limit.
      */
     function getLicenseTypes() external view returns (string[] memory) {
-        uint256 numLicenseTypes = _licenseTypes.length();
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        uint256 numLicenseTypes = ds.licenseTypes.length();
         string[] memory licenseTypes = new string[](numLicenseTypes);
 
-        for (uint256 i = 0; i < numLicenseTypes; i++) {
-            licenseTypes[i] = _licenseTypes.at(i).toString();
+        for (uint256 i; i < numLicenseTypes; ) {
+            licenseTypes[i] = ds.licenseTypes.at(i).toString();
+            unchecked {
+                ++i;
+            }
         }
         return licenseTypes;
     }
@@ -684,61 +777,202 @@ contract DependencyRegistryV0 is
      * @return Number of registered license types.
      */
     function getLicenseTypeCount() external view returns (uint256) {
-        return _licenseTypes.length();
+        return DependencyRegistryStorageLib.s().licenseTypes.length();
     }
 
     /**
-     * @notice Returns registered license type at index `_index`.
-     * @return Registered license type at `_index`, relative to the overall length of the license type set.
+     * @notice Returns registered license type at index `index`.
+     * @return Registered license type at `index`, relative to the overall length of the license type set.
      */
     function getLicenseType(
-        uint256 _index
+        uint256 index
     ) external view returns (string memory) {
-        _onlyInRangeIndex({_index: _index, _length: _licenseTypes.length()});
-        return _licenseTypes.at(_index).toString();
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        _onlyInRangeIndex({index: index, length: ds.licenseTypes.length()});
+        return ds.licenseTypes.at(index).toString();
+    }
+
+    /**
+     * @notice Adds a full license text to license `licenseType`, by way of
+     *         providing a string to write to bytecode storage.
+     * @param licenseType Name of license type (e.g. "MIT") used to identify license.
+     * @param text Text to be added. Required to be a non-empty string,
+     *                but no further validation is performed.
+     */
+    function addLicenseText(bytes32 licenseType, string memory text) external {
+        _onlyAdminACL(this.addLicenseText.selector);
+        _onlyNonEmptyString(text);
+        _onlyExistingLicenseType(licenseType);
+
+        DependencyRegistryStorageLib.License
+            storage licenseEntry = DependencyRegistryStorageLib.s().allLicenses[
+                licenseType
+            ];
+        // store license chunk in contract bytecode
+        licenseEntry.licenseBytecodeAddresses[
+            licenseEntry.licenseChunkCount
+        ] = text.writeToBytecode();
+        licenseEntry.licenseChunkCount = licenseEntry.licenseChunkCount + 1;
+
+        emit LicenseTextUpdated(licenseType);
     }
 
     /**
-     * @notice Returns details for a given depedency type `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @return typeAndVersion String representation of `_dependencyType`.
+     * @notice Updates the license text for license `licenseType` at index `_index`,
+     *         by way of providing a string to write to bytecode storage.
+     * @param licenseType Name of license type (e.g. "MIT") used to identify license.
+     * @param index The index of a given license text chunk, relative to the overall `licenseChunkCount`.
+     * @param text The updated license text value. Required to be a non-empty
+     *                string, but no further validation is performed.
+     */
+    function updateLicenseText(
+        bytes32 licenseType,
+        uint256 index,
+        string memory text
+    ) external {
+        _onlyAdminACL(this.updateLicenseText.selector);
+        _onlyNonEmptyString(text);
+        _onlyExistingLicenseType(licenseType);
+
+        DependencyRegistryStorageLib.License
+            storage licenseEntry = DependencyRegistryStorageLib.s().allLicenses[
+                licenseType
+            ];
+        _onlyInRangeIndex({
+            index: index,
+            length: licenseEntry.licenseChunkCount
+        });
+        // store license text chunk in contract bytecode, replacing reference address from
+        // the contract that is no longer referenced with the newly created one
+        licenseEntry.licenseBytecodeAddresses[index] = text.writeToBytecode();
+
+        emit LicenseTextUpdated(licenseType);
+    }
+
+    /**
+     * @notice Removes the last license text chunk from license `licenseType`.
+     * @param licenseType Name of license type (e.g. "MIT") used to identify license.
+     */
+    function removeLicenseLastText(bytes32 licenseType) external {
+        _onlyAdminACL(this.removeLicenseLastText.selector);
+        _onlyExistingLicenseType(licenseType);
+
+        DependencyRegistryStorageLib.License
+            storage licenseEntry = DependencyRegistryStorageLib.s().allLicenses[
+                licenseType
+            ];
+        uint24 licenseChunkCount = licenseEntry.licenseChunkCount;
+        require(licenseChunkCount > 0, "There is no license text to remove");
+        // delete reference to old storage contract address
+        delete licenseEntry.licenseBytecodeAddresses[licenseChunkCount - 1];
+        unchecked {
+            licenseEntry.licenseChunkCount = licenseChunkCount - 1;
+        }
+
+        emit LicenseTextUpdated(licenseType);
+    }
+
+    /**
+     * @notice Returns license text for license `licenseType` at script index `index`.
+     * @param licenseType Name of license type (e.g. "MIT") used to identify license.
+     * @param index The index of a given script, relative to the overall `licenseChunkCount`.
+     * @return A string containing the license text content at the given script chunk index for a given license.
+     * @dev This method attempts to introspectively determine which library version of
+     *      `BytecodeStorage` was used to write the stored script string that is being
+     *      read back, in order to use the proper read approach. If the version is
+     *      non-determinate, a fall-back to reading using the assumption that the bytes
+     *      were written with `SSTORE2` is used.
+     *      Also note that in this `SSTORE2` fallback handling, the approach of casting bytes to string
+     *      can cause failure (e.g. unexpected continuation byte).
+     */
+    function getLicenseText(
+        bytes32 licenseType,
+        uint256 index
+    ) external view returns (string memory) {
+        DependencyRegistryStorageLib.License
+            storage licenseEntry = DependencyRegistryStorageLib.s().allLicenses[
+                licenseType
+            ];
+        _onlyInRangeIndex({
+            index: index,
+            length: licenseEntry.licenseChunkCount
+        });
+
+        address licenseAddress = licenseEntry.licenseBytecodeAddresses[index];
+        bytes32 storageVersion = BytecodeStorageReader
+            .getLibraryVersionForBytecode(licenseAddress);
+        if (storageVersion == BytecodeStorageReader.UNKNOWN_VERSION_STRING) {
+            return
+                string(
+                    BytecodeStorageReader.readBytesFromSSTORE2Bytecode(
+                        licenseAddress
+                    )
+                );
+        } else {
+            return BytecodeStorageReader.readFromBytecode(licenseAddress);
+        }
+    }
+
+    /**
+     * @notice Returns the count of license chunks for license `licenseType`.
+     * @param licenseType Name of license type (e.g. "MIT") used to identify dependency.
+     */
+    function getLicenseTextChunkCount(
+        bytes32 licenseType
+    ) external view returns (uint256) {
+        return
+            DependencyRegistryStorageLib
+                .s()
+                .allLicenses[licenseType]
+                .licenseChunkCount;
+    }
+
+    /**
+     * @notice Returns details for a given dependency type `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @return nameAndVersion String representation of `dependencyNameAndVersion`.
      *                        (e.g. "p5js(atSymbol)1.0.0")
      * @return licenseType License type for dependency
      * @return preferredCDN Preferred CDN URL for dependency
      * @return additionalCDNCount Count of additional CDN URLs for dependency
      * @return preferredRepository Preferred repository URL for dependency
      * @return additionalRepositoryCount Count of additional repository URLs for dependency
-     * @return referenceWebsite Project website URL for dependency
+     * @return dependencyWebsite Project website URL for dependency
      * @return availableOnChain Whether dependency is available on chain
      * @return scriptCount Count of on-chain scripts for dependency
      */
     function getDependencyDetails(
-        bytes32 _dependencyType
+        bytes32 dependencyNameAndVersion
     )
         external
         view
         returns (
-            string memory typeAndVersion,
+            string memory nameAndVersion,
             string memory licenseType,
             string memory preferredCDN,
             uint24 additionalCDNCount,
             string memory preferredRepository,
             uint24 additionalRepositoryCount,
-            string memory referenceWebsite,
+            string memory dependencyWebsite,
             bool availableOnChain,
             uint24 scriptCount
         )
     {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
 
         return (
-            _dependencyType.toString(),
+            dependencyNameAndVersion.toString(),
             dependency.licenseType.toString(),
             dependency.preferredCDN,
             dependency.additionalCDNCount,
             dependency.preferredRepository,
             dependency.additionalRepositoryCount,
-            dependency.referenceWebsite,
+            dependency.website,
             dependency.scriptCount > 0,
             dependency.scriptCount
         );
@@ -749,23 +983,27 @@ contract DependencyRegistryV0 is
      * @return Number of supported core contracts.
      */
     function getSupportedCoreContractCount() external view returns (uint256) {
-        return _supportedCoreContracts.length();
+        return DependencyRegistryStorageLib.s().supportedCoreContracts.length();
     }
 
     /**
-     * @notice Returns the address of the supported core contract at index `_index`.
-     * @param _index Index of the core contract to be returned, relative to the overall
+     * @notice Returns the address of the supported core contract at index `index`.
+     * @param index Index of the core contract to be returned, relative to the overall
      *               list of supported core contracts.
      * @return address of the core contract.
      */
     function getSupportedCoreContract(
-        uint256 _index
+        uint256 index
     ) external view returns (address) {
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
         _onlyInRangeIndex({
-            _index: _index,
-            _length: _supportedCoreContracts.length()
+            index: index,
+            length: ds.supportedCoreContracts.length()
         });
-        return _supportedCoreContracts.at(_index);
+
+        return ds.supportedCoreContracts.at(index);
     }
 
     /**
@@ -776,7 +1014,10 @@ contract DependencyRegistryV0 is
     function isSupportedCoreContract(
         address coreContractAddress
     ) external view returns (bool) {
-        return _supportedCoreContracts.contains(coreContractAddress);
+        return
+            DependencyRegistryStorageLib.s().supportedCoreContracts.contains(
+                coreContractAddress
+            );
     }
 
     /**
@@ -790,83 +1031,102 @@ contract DependencyRegistryV0 is
         view
         returns (address[] memory)
     {
-        uint256 supportedCoreContractCount = _supportedCoreContracts.length();
+        DependencyRegistryStorageLib.Storage
+            storage ds = DependencyRegistryStorageLib.s();
+
+        uint256 supportedCoreContractCount = ds.supportedCoreContracts.length();
         address[] memory supportedCoreContracts = new address[](
             supportedCoreContractCount
         );
 
-        for (uint256 i = 0; i < supportedCoreContractCount; i++) {
-            supportedCoreContracts[i] = _supportedCoreContracts.at(i);
+        for (uint256 i; i < supportedCoreContractCount; ) {
+            supportedCoreContracts[i] = ds.supportedCoreContracts.at(i);
+            unchecked {
+                ++i;
+            }
         }
 
         return supportedCoreContracts;
     }
 
     /**
-     * @notice Returns the additional CDN URL at index `_index` for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional CDN, relative to the overall `additionalCDNCount`.
+     * @notice Returns the additional CDN URL at index `index` for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional CDN, relative to the overall `additionalCDNCount`.
      */
     function getDependencyAdditionalCDN(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external view returns (string memory) {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         _onlyInRangeIndex({
-            _index: _index,
-            _length: dependency.additionalCDNCount
+            index: index,
+            length: dependency.additionalCDNCount
         });
-        return dependency.additionalCDNs[_index];
+        return dependency.additionalCDNs[index];
     }
 
     /**
-     * @notice Returns the additional repository URL at index `_index` for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
+     * @notice Returns the additional repository URL at index `index` for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of an additional repository, relative to the overall `additionalRepositoryCount`.
      */
     function getDependencyAdditionalRepository(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external view returns (string memory) {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
         _onlyInRangeIndex({
-            _index: _index,
-            _length: dependency.additionalRepositoryCount
+            index: index,
+            length: dependency.additionalRepositoryCount
         });
-        return dependency.additionalRepositories[_index];
+        return dependency.additionalRepositories[index];
     }
 
     /**
-     * @notice Returns the count of scripts for dependency `_dependencyType`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
+     * @notice Returns the count of scripts for dependency `dependencyNameAndVersion`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
      */
     function getDependencyScriptCount(
-        bytes32 _dependencyType
+        bytes32 dependencyNameAndVersion
     ) external view returns (uint256) {
-        return dependencyDetails[_dependencyType].scriptCount;
+        return
+            DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion]
+                .scriptCount;
     }
 
     /**
      * @notice Returns address with bytecode containing script for
-     *         dependency `_dependencyTypes` at script index `_index`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of a given script, relative to the overall `scriptCount`.
+     *         dependency `_dependencyTypes` at script index `index`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of a given script, relative to the overall `scriptCount`.
      * @return The address of the bytecode storage for the script at the given index, if it can be determined.
      */
     function getDependencyScriptBytecodeAddress(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external view returns (address) {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
-        return dependency.scriptBytecodeAddresses[_index];
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
+        _onlyInRangeIndex({index: index, length: dependency.scriptCount});
+        return dependency.scriptBytecodeAddresses[index];
     }
 
     /**
      * @notice Returns the storage library version for
-     *         dependency `_dependencyTypes` at script index `_index`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of a given script, relative to the overall `scriptCount`.
+     *         dependency `_dependencyTypes` at script index `index`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of a given script, relative to the overall `scriptCount`.
      * @return The storage library version for the script at the given index, if it can be determined.
      * @dev Note that we only expect this to be determinable if the script was written using a version
      *      of the Art Blocks `BytecodeStorage` library, and in other cases the fallback will be the
@@ -875,23 +1135,24 @@ contract DependencyRegistryV0 is
      *      that can be fallback-read optimistically.
      */
     function getDependencyScriptBytecodeStorageVersion(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external view returns (bytes32) {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
+        _onlyInRangeIndex({index: index, length: dependency.scriptCount});
         return
             BytecodeStorageReader.getLibraryVersionForBytecode(
-                dependencyDetails[_dependencyType].scriptBytecodeAddresses[
-                    _index
-                ]
+                dependency.scriptBytecodeAddresses[index]
             );
     }
 
     /**
-     * @notice Returns script for dependency `_dependencyType` at script index `_index`.
-     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
-     * @param _index The index of a given script, relative to the overall `scriptCount`.
+     * @notice Returns script for dependency `dependencyNameAndVersion` at script index `index`.
+     * @param dependencyNameAndVersion Name and version of dependency (i.e. "name@version") used to identify dependency.
+     * @param index The index of a given script, relative to the overall `scriptCount`.
      * @return A string containing the script content at the given script chunk index for a given dependency.
      * @dev This method attempts to introspectively determine which library version of
      *      `BytecodeStorage` was used to write the stored script string that is being
@@ -902,13 +1163,16 @@ contract DependencyRegistryV0 is
      *      can cause failure (e.g. unexpected continuation byte).
      */
     function getDependencyScript(
-        bytes32 _dependencyType,
-        uint256 _index
+        bytes32 dependencyNameAndVersion,
+        uint256 index
     ) external view returns (string memory) {
-        Dependency storage dependency = dependencyDetails[_dependencyType];
-        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
+        DependencyRegistryStorageLib.Dependency
+            storage dependency = DependencyRegistryStorageLib
+                .s()
+                .dependencyRecords[dependencyNameAndVersion];
+        _onlyInRangeIndex({index: index, length: dependency.scriptCount});
 
-        address scriptAddress = dependency.scriptBytecodeAddresses[_index];
+        address scriptAddress = dependency.scriptBytecodeAddresses[index];
         bytes32 storageVersion = BytecodeStorageReader
             .getLibraryVersionForBytecode(scriptAddress);
 
@@ -925,30 +1189,31 @@ contract DependencyRegistryV0 is
     }
 
     /**
-     * @notice Returns the dependency type for a given project (`projectId`)
+     * @notice Returns the dependency name and version for a given project (`projectId`)
      * on a given core contract (`_contractAddress`). If no override is set,
      * the core contract is called to retrieve the script type and version as
      * dependency type. For any contract earlier than v3, that does not have
      * an override set, this will revert.
-     * @param _contractAddress Core contract address.
-     * @param _projectId Project to return dependency type for.
-     * @return dependencyType Identifier for the dependency (i.e. "type@version") used by project.
+     * @param contractAddress Core contract address.
+     * @param projectId Project to return dependency type for.
+     * @return dependencyType Identifier for the dependency (i.e. "name@version") used by project.
      */
-    function getDependencyTypeForProject(
-        address _contractAddress,
-        uint256 _projectId
+    function getDependencyNameAndVersionForProject(
+        address contractAddress,
+        uint256 projectId
     ) external view returns (string memory) {
-        _onlySupportedCoreContract(_contractAddress);
-        bytes32 dependencyType = projectDependencyTypeOverrides[
-            _contractAddress
-        ][_projectId];
-        if (dependencyType != bytes32(0)) {
-            return dependencyType.toString();
+        _onlySupportedCoreContract(contractAddress);
+
+        bytes32 dependencyNameAndVersion = DependencyRegistryStorageLib
+            .s()
+            .projectDependencyOverrides[contractAddress][projectId];
+        if (dependencyNameAndVersion != bytes32(0)) {
+            return dependencyNameAndVersion.toString();
         }
 
         try
-            IDependencyRegistryCompatibleV0(_contractAddress)
-                .projectScriptDetails(_projectId)
+            IDependencyRegistryCompatibleV0(contractAddress)
+                .projectScriptDetails(projectId)
         returns (string memory scriptTypeAndVersion, string memory, uint256) {
             return scriptTypeAndVersion;
         } catch {
@@ -964,13 +1229,13 @@ contract DependencyRegistryV0 is
      * determined by this contract's current Admin ACL contract. Expected use
      * cases include minter contracts checking if caller is allowed to call
      * admin-gated functions on minter contracts.
-     * @param _sender Address of the sender calling function with selector
-     * `_selector` on contract `_contract`.
-     * @param _contract Address of the contract being called by `_sender`.
-     * @param _selector Function selector of the function being called by
-     * `_sender`.
-     * @return bool Whether `_sender` is allowed to call function with selector
-     * `_selector` on contract `_contract`.
+     * @param sender Address of the sender calling function with selector
+     * `selector` on contract `contract_`.
+     * @param contract_ Address of the contract being called by `sender`.
+     * @param selector Function selector of the function being called by
+     * `sender`.
+     * @return bool Whether `sender` is allowed to call function with selector
+     * `selector` on contract `contract_`.
      * @dev assumes the Admin ACL contract is the owner of this contract, which
      * is expected to always be true.
      * @dev adminACLContract is expected to either be null address (if owner
@@ -978,13 +1243,17 @@ contract DependencyRegistryV0 is
      * null address first to avoid revert when admin has renounced ownership.
      */
     function adminACLAllowed(
-        address _sender,
-        address _contract,
-        bytes4 _selector
+        address sender,
+        address contract_,
+        bytes4 selector
     ) public returns (bool) {
         return
             owner() != address(0) &&
-            adminACLContract.allowed(_sender, _contract, _selector);
+            DependencyRegistryStorageLib.s().adminACLContract.allowed(
+                sender,
+                contract_,
+                selector
+            );
     }
 
     /**
@@ -1003,6 +1272,14 @@ contract DependencyRegistryV0 is
         return OwnableUpgradeable.owner();
     }
 
+    /**
+     * @notice This function returns the address of the admin ACL contract.
+     * @return address Address of the admin ACL contract.
+     */
+    function adminACLContract() public view returns (address) {
+        return address(DependencyRegistryStorageLib.s().adminACLContract);
+    }
+
     /**
      * @notice Transfers ownership of the contract to a new account (`newOwner`).
      * Internal function without access restriction.
@@ -1013,6 +1290,8 @@ contract DependencyRegistryV0 is
      */
     function _transferOwnership(address newOwner) internal override {
         OwnableUpgradeable._transferOwnership(newOwner);
-        adminACLContract = IAdminACLV0(newOwner);
+        DependencyRegistryStorageLib.s().adminACLContract = IAdminACLV0(
+            newOwner
+        );
     }
 }