@artblocks/contracts 1.0.2 → 1.0.4

package/contracts/DependencyRegistryV0.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 // Created By: Art Blocks Inc.
 
-import "./interfaces/0.8.x/IAdminACLV0.sol";
-import "./interfaces/0.8.x/IDependencyRegistryCompatibleV0.sol";
-import "./interfaces/0.8.x/IDependencyRegistryV0.sol";
+import "./interfaces/v0.8.x/IAdminACLV0.sol";
+import "./interfaces/v0.8.x/IDependencyRegistryCompatibleV0.sol";
+import "./interfaces/v0.8.x/IDependencyRegistryV0.sol";
 
 import "@openzeppelin-4.7/contracts/utils/Strings.sol";
 import "@openzeppelin-4.7/contracts/utils/structs/EnumerableSet.sol";
@@ -13,8 +13,8 @@ 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/0.8.x/BytecodeStorage.sol";
-import "./libs/0.8.x/Bytes32Strings.sol";
+import "./libs/v0.8.x/BytecodeStorageV1.sol";
+import "./libs/v0.8.x/Bytes32Strings.sol";
 
 /**
  * @title Art Blocks Dependency Registry, V0.
@@ -33,8 +33,7 @@ contract DependencyRegistryV0 is
     OwnableUpgradeable,
     IDependencyRegistryV0
 {
-    using BytecodeStorage for string;
-    using BytecodeStorage for address;
+    using BytecodeStorageWriter for string;
     using Bytes32Strings for bytes32;
     using Strings for uint256;
     using EnumerableSet for EnumerableSet.Bytes32Set;
@@ -48,8 +47,10 @@ contract DependencyRegistryV0 is
 
     struct Dependency {
         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
@@ -98,6 +99,10 @@ contract DependencyRegistryV0 is
         );
     }
 
+    function _onlyInRangeIndex(uint256 _index, uint256 _length) internal pure {
+        require(_index < _length, "Index out of range");
+    }
+
     /**
      * @notice Initializes contract.
      * @param _adminACLContract Address of admin access control contract, to be
@@ -135,10 +140,10 @@ contract DependencyRegistryV0 is
         );
 
         _dependencyTypes.add(_dependencyType);
-        Dependency storage dependencyType = dependencyDetails[_dependencyType];
-        dependencyType.preferredCDN = _preferredCDN;
-        dependencyType.preferredRepository = _preferredRepository;
-        dependencyType.referenceWebsite = _referenceWebsite;
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        dependency.preferredCDN = _preferredCDN;
+        dependency.preferredRepository = _preferredRepository;
+        dependency.referenceWebsite = _referenceWebsite;
 
         emit DependencyAdded(
             _dependencyType,
@@ -150,7 +155,7 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Removes a dependency.
-     * @param _dependencyType Name of dependency type (i.e. "type@version")
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      */
     function removeDependency(bytes32 _dependencyType) external {
         _onlyAdminACL(this.removeDependency.selector);
@@ -170,10 +175,11 @@ contract DependencyRegistryV0 is
     }
 
     /**
-     * @notice Adds a script to dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @notice Adds a script to dependency `_dependencyType`, 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,
-     * but no further validation is performed.
+     *                but no further validation is performed.
      */
     function addDependencyScript(
         bytes32 _dependencyType,
@@ -192,65 +198,87 @@ contract DependencyRegistryV0 is
     }
 
     /**
-     * @notice Updates script for dependencyType `_dependencyType` at script ID `_scriptId`.
-     * @param _dependencyType dependency to be updated.
-     * @param _scriptId Script ID to be updated.
+     * @notice Updates script for dependencyType `_dependencyType` 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
-     * string, but no further validation is performed.
+     *                string, but no further validation is performed.
      */
     function updateDependencyScript(
         bytes32 _dependencyType,
-        uint256 _scriptId,
+        uint256 _index,
         string memory _script
     ) external {
         _onlyAdminACL(this.updateDependencyScript.selector);
         _onlyNonEmptyString(_script);
         _onlyExistingDependencyType(_dependencyType);
-        Dependency storage dependencyType = dependencyDetails[_dependencyType];
-        require(
-            _scriptId < dependencyType.scriptCount,
-            "scriptId out of range"
-        );
-        // purge old contract bytecode contract from the blockchain state
-        // note: Although this does reduce usage of Ethereum state, it does not
-        // reduce the gas costs of removal transactions. We believe this is the
-        // best behavior at the time of writing, and do not expect this to
-        // result in any breaking changes in the future. All current proposals
-        // to change the self-destruct opcode are backwards compatible, but may
-        // result in not removing the bytecode from the blockchain state. This
-        // implementation is compatible with that architecture, as it does not
-        // rely on the bytecode being removed from the blockchain state.
-        dependencyType.scriptBytecodeAddresses[_scriptId].purgeBytecode();
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _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
-        dependencyType.scriptBytecodeAddresses[_scriptId] = _script
-            .writeToBytecode();
+        dependency.scriptBytecodeAddresses[_index] = _script.writeToBytecode();
+
+        emit DependencyScriptUpdated(_dependencyType);
+    }
+
+    /**
+     * @notice Adds a script to dependency `_dependencyType`, 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,
+     *                       but no further validation is performed.
+     */
+    function addDependencyScriptPointer(
+        bytes32 _dependencyType,
+        address _scriptPointer
+    ) external {
+        _onlyAdminACL(this.addDependencyScriptPointer.selector);
+        _onlyNonZeroAddress(_scriptPointer);
+        _onlyExistingDependencyType(_dependencyType);
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        // store script in contract bytecode
+        dependency.scriptBytecodeAddresses[
+            dependency.scriptCount
+        ] = _scriptPointer;
+        dependency.scriptCount = dependency.scriptCount + 1;
+
+        emit DependencyScriptUpdated(_dependencyType);
+    }
+
+    /**
+     * @notice Updates script for dependencyType `_dependencyType` 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).
+     *                       Required to be a non-zero address, but no further validation is performed.
+     */
+    function updateDependencyScriptPointer(
+        bytes32 _dependencyType,
+        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;
 
         emit DependencyScriptUpdated(_dependencyType);
     }
 
     /**
      * @notice Removes last script from dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      */
     function removeDependencyLastScript(bytes32 _dependencyType) external {
         _onlyAdminACL(this.removeDependencyLastScript.selector);
         _onlyExistingDependencyType(_dependencyType);
         Dependency storage dependency = dependencyDetails[_dependencyType];
         require(dependency.scriptCount > 0, "there are no scripts to remove");
-        // purge old contract bytecode contract from the blockchain state
-        // note: Although this does reduce usage of Ethereum state, it does not
-        // reduce the gas costs of removal transactions. We believe this is the
-        // best behavior at the time of writing, and do not expect this to
-        // result in any breaking changes in the future. All current proposals
-        // to change the self-destruct opcode are backwards compatible, but may
-        // result in not removing the bytecode from the blockchain state. This
-        // implementation is compatible with that architecture, as it does not
-        // rely on the bytecode being removed from the blockchain state.
-        dependency
-            .scriptBytecodeAddresses[dependency.scriptCount - 1]
-            .purgeBytecode();
-        // delete reference to contract address that no longer exists
+        // delete reference to old storage contract address
         delete dependency.scriptBytecodeAddresses[dependency.scriptCount - 1];
         unchecked {
             dependency.scriptCount = dependency.scriptCount - 1;
@@ -261,7 +289,7 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Updates preferred CDN for dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      * @param _preferredCDN URL for preferred CDN.
      */
     function updateDependencyPreferredCDN(
@@ -277,7 +305,7 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Updates preferred repository for dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      * @param _preferredRepository URL for preferred repository.
      */
     function updateDependencyPreferredRepository(
@@ -297,7 +325,7 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Updates project website for dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      * @param _referenceWebsite URL for project website.
      */
     function updateDependencyReferenceWebsite(
@@ -316,9 +344,9 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Adds a new CDN url to `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @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,
-     * but no further validation is performed.
+     *                       but no further validation is performed.
      */
     function addDependencyAdditionalCDN(
         bytes32 _dependencyType,
@@ -344,19 +372,19 @@ contract DependencyRegistryV0 is
      * @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 dependency to be updated.
-     * @param _index Additional CDN 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`.
      */
-    function removeDependencyAdditionalCDNAtIndex(
+    function removeDependencyAdditionalCDN(
         bytes32 _dependencyType,
         uint256 _index
     ) external {
-        _onlyAdminACL(this.removeDependencyAdditionalCDNAtIndex.selector);
+        _onlyAdminACL(this.removeDependencyAdditionalCDN.selector);
         _onlyExistingDependencyType(_dependencyType);
         Dependency storage dependency = dependencyDetails[_dependencyType];
 
         uint256 additionalCDNCount = dependency.additionalCDNCount;
-        require(_index < additionalCDNCount, "Asset index out of range");
+        _onlyInRangeIndex({_index: _index, _length: additionalCDNCount});
 
         uint256 lastElementIndex = additionalCDNCount - 1;
 
@@ -372,21 +400,23 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Updates additional CDN for dependency `_dependencyType` at `_index`.
-     * @param _dependencyType dependency to be updated.
-     * @param _index Additional CDN 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.
      */
-    function updateDependencyAdditionalCDNAtIndex(
+    function updateDependencyAdditionalCDN(
         bytes32 _dependencyType,
         uint256 _index,
         string memory _additionalCDN
     ) external {
-        _onlyAdminACL(this.updateDependencyAdditionalCDNAtIndex.selector);
+        _onlyAdminACL(this.updateDependencyAdditionalCDN.selector);
         _onlyNonEmptyString(_additionalCDN);
         _onlyExistingDependencyType(_dependencyType);
         Dependency storage dependency = dependencyDetails[_dependencyType];
-        uint24 additionalCDNCount = dependency.additionalCDNCount;
-        require(_index < additionalCDNCount, "Asset index out of range");
+        _onlyInRangeIndex({
+            _index: _index,
+            _length: dependency.additionalCDNCount
+        });
 
         dependency.additionalCDNs[_index] = _additionalCDN;
 
@@ -399,7 +429,7 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Adds a new repository URL to dependency `_dependencyType`.
-     * @param _dependencyType dependency to be updated.
+     * @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,
      * but no further validation is performed.
      */
@@ -432,22 +462,19 @@ contract DependencyRegistryV0 is
      * @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 dependency to be updated.
-     * @param _index Additional repository 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`.
      */
-    function removeDependencyAdditionalRepositoryAtIndex(
+    function removeDependencyAdditionalRepository(
         bytes32 _dependencyType,
         uint256 _index
     ) external {
-        _onlyAdminACL(
-            this.removeDependencyAdditionalRepositoryAtIndex.selector
-        );
+        _onlyAdminACL(this.removeDependencyAdditionalRepository.selector);
         _onlyExistingDependencyType(_dependencyType);
         Dependency storage dependency = dependencyDetails[_dependencyType];
-        uint256 additionalRepositoryCount = uint256(
-            dependency.additionalRepositoryCount
-        );
-        require(_index < additionalRepositoryCount, "Asset index out of range");
+        uint256 additionalRepositoryCount = dependency
+            .additionalRepositoryCount;
+        _onlyInRangeIndex({_index: _index, _length: additionalRepositoryCount});
 
         uint256 lastElementIndex = additionalRepositoryCount - 1;
 
@@ -463,23 +490,23 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Updates additional repository for dependency `_dependencyType` at `_index`.
-     * @param _dependencyType dependency to be updated.
-     * @param _index Additional repository 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.
      */
-    function updateDependencyAdditionalRepositoryAtIndex(
+    function updateDependencyAdditionalRepository(
         bytes32 _dependencyType,
         uint256 _index,
         string memory _additionalRepository
     ) external {
-        _onlyAdminACL(
-            this.updateDependencyAdditionalRepositoryAtIndex.selector
-        );
+        _onlyAdminACL(this.updateDependencyAdditionalRepository.selector);
         _onlyNonEmptyString(_additionalRepository);
         _onlyExistingDependencyType(_dependencyType);
         Dependency storage dependency = dependencyDetails[_dependencyType];
-        uint24 additionalRepositoryCount = dependency.additionalRepositoryCount;
-        require(_index < additionalRepositoryCount, "Asset index out of range");
+        _onlyInRangeIndex({
+            _index: _index,
+            _length: dependency.additionalRepositoryCount
+        });
 
         dependency.additionalRepositories[_index] = _additionalRepository;
 
@@ -526,7 +553,7 @@ contract DependencyRegistryV0 is
      * type (`_dependencyType`).
      * @param _contractAddress Core contract address.
      * @param _projectId Project to override script type and version for.
-     * @param _dependencyType Dependency type to return for project.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      */
     function addProjectDependencyTypeOverride(
         address _contractAddress,
@@ -597,20 +624,20 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Returns registered depenedency type at index `_index`.
-     * @return Registered dependency at `_index`.
+     * @return Registered dependency at `_index`, relative to the overall length of the dependency type set.
      */
-    function getDependencyTypeAtIndex(
+    function getDependencyType(
         uint256 _index
     ) external view returns (string memory) {
-        require(_dependencyTypes.length() > _index, "Index out of range");
+        _onlyInRangeIndex({_index: _index, _length: _dependencyTypes.length()});
         return _dependencyTypes.at(_index).toString();
     }
 
     /**
-     * @notice Returns details for depedency type `_dependencyType`.
-     * @param _dependencyType Dependency type to be queried.
+     * @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`.
-     * (e.g. "p5js(atSymbol)1.0.0")
+     *                        (e.g. "p5js(atSymbol)1.0.0")
      * @return preferredCDN Preferred CDN URL for dependency
      * @return additionalCDNCount Count of additional CDN URLs for dependency
      * @return preferredRepository Preferred repository URL for dependency
@@ -659,19 +686,31 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Returns the address of the supported core contract at index `_index`.
-     * @param _index Index of the core contract to be returned.
+     * @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 getSupportedCoreContractAtIndex(
+    function getSupportedCoreContract(
         uint256 _index
     ) external view returns (address) {
-        require(
-            _supportedCoreContracts.length() > _index,
-            "Index out of bounds"
-        );
+        _onlyInRangeIndex({
+            _index: _index,
+            _length: _supportedCoreContracts.length()
+        });
         return _supportedCoreContracts.at(_index);
     }
 
+    /**
+     * @notice Returns whether the given contract address is a supported core contract.
+     * @param coreContractAddress Address of the core contract to be queried.
+     * @return True if the given contract address is a supported core contract.
+     */
+    function isSupportedCoreContract(
+        address coreContractAddress
+    ) external view returns (bool) {
+        return _supportedCoreContracts.contains(coreContractAddress);
+    }
+
     /**
      * @notice Returns a list of supported core contracts.
      * @return List of supported core contracts.
@@ -697,32 +736,41 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Returns the additional CDN URL at index `_index` for dependency `_dependencyType`.
-     * @param _dependencyType Dependency type to be queried.
-     * @param _index Index of the additional CDN URL to be returned.
+     * @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`.
      */
-    function getDependencyAdditionalCDNAtIndex(
+    function getDependencyAdditionalCDN(
         bytes32 _dependencyType,
         uint256 _index
     ) external view returns (string memory) {
-        return dependencyDetails[_dependencyType].additionalCDNs[_index];
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyInRangeIndex({
+            _index: _index,
+            _length: dependency.additionalCDNCount
+        });
+        return dependency.additionalCDNs[_index];
     }
 
     /**
      * @notice Returns the additional repository URL at index `_index` for dependency `_dependencyType`.
-     * @param _dependencyType Dependency type to be queried.
-     * @param _index Index of the additional repository URL to be returned.
+     * @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`.
      */
-    function getDependencyAdditionalRepositoryAtIndex(
+    function getDependencyAdditionalRepository(
         bytes32 _dependencyType,
         uint256 _index
     ) external view returns (string memory) {
-        return
-            dependencyDetails[_dependencyType].additionalRepositories[_index];
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyInRangeIndex({
+            _index: _index,
+            _length: dependency.additionalRepositoryCount
+        });
+        return dependency.additionalRepositories[_index];
     }
 
     /**
      * @notice Returns the count of scripts for dependency `_dependencyType`.
-     * @param _dependencyType Dependency type to be queried.
+     * @param _dependencyType Name of dependency type (i.e. "type@version") used to identify dependency.
      */
     function getDependencyScriptCount(
         bytes32 _dependencyType
@@ -732,32 +780,80 @@ contract DependencyRegistryV0 is
 
     /**
      * @notice Returns address with bytecode containing script for
-     * dependency `_dependencyTypes` at script index `_index`.
+     *         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`.
+     * @return The address of the bytecode storage for the script at the given index, if it can be determined.
      */
-    function getDependencyScriptBytecodeAddressAtIndex(
+    function getDependencyScriptBytecodeAddress(
         bytes32 _dependencyType,
         uint256 _index
     ) external view returns (address) {
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _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`.
+     * @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
+     *      unknown version string, as defined by the `BytecodeStorage` UNKNOWN_VERSION_STRING – this
+     *      is inclusive of the in the case of `SSTORE2` written data blobs, which are an unknown version
+     *      that can be fallback-read optimistically.
+     */
+    function getDependencyScriptBytecodeStorageVersion(
+        bytes32 _dependencyType,
+        uint256 _index
+    ) external view returns (bytes32) {
+        Dependency storage dependency = dependencyDetails[_dependencyType];
+        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
         return
-            dependencyDetails[_dependencyType].scriptBytecodeAddresses[_index];
+            BytecodeStorageReader.getLibraryVersionForBytecode(
+                dependencyDetails[_dependencyType].scriptBytecodeAddresses[
+                    _index
+                ]
+            );
     }
 
     /**
      * @notice Returns script for dependency `_dependencyType` at script index `_index`.
-     * @param _dependencyType dependency to be queried.
-     * @param _index Index of script to be queried.
-     */
-    function getDependencyScriptAtIndex(
+     * @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`.
+     * @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
+     *      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 getDependencyScript(
         bytes32 _dependencyType,
         uint256 _index
     ) external view returns (string memory) {
         Dependency storage dependency = dependencyDetails[_dependencyType];
-        // If trying to access an out-of-index script, return the empty string.
-        if (_index >= dependency.scriptCount) {
-            return "";
+        _onlyInRangeIndex({_index: _index, _length: dependency.scriptCount});
+
+        address scriptAddress = dependency.scriptBytecodeAddresses[_index];
+        bytes32 storageVersion = BytecodeStorageReader
+            .getLibraryVersionForBytecode(scriptAddress);
+
+        if (storageVersion == BytecodeStorageReader.UNKNOWN_VERSION_STRING) {
+            return
+                string(
+                    BytecodeStorageReader.readBytesFromSSTORE2Bytecode(
+                        scriptAddress
+                    )
+                );
+        } else {
+            return BytecodeStorageReader.readFromBytecode(scriptAddress);
         }
-
-        return dependency.scriptBytecodeAddresses[_index].readFromBytecode();
     }
 
     /**
@@ -768,7 +864,7 @@ contract DependencyRegistryV0 is
      * an override set, this will revert.
      * @param _contractAddress Core contract address.
      * @param _projectId Project to return dependency type for.
-     * @return dependencyType Dependency type used by project.
+     * @return dependencyType Identifier for the dependency (i.e. "type@version") used by project.
      */
     function getDependencyTypeForProject(
         address _contractAddress,