From eb08f4f79db8271c7fa0fd3d62159242ec0d4736 Mon Sep 17 00:00:00 2001 From: Kelvin Fichter Date: Tue, 17 Sep 2024 13:52:11 -0400 Subject: [PATCH] fix: move IERC20Solady into vendor folder An additional "dependency" folder was added in a recent PR, this is the same purpose as the "vendor" folder so the interface added in that PR can simply be moved to the "vendor" folder instead. --- .../src/L2/interfaces/IOptimismSuperchainERC20.sol | 5 +++-- .../contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol | 3 ++- .../src/{dependency => vendor}/interfaces/IERC20Solady.sol | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename packages/contracts-bedrock/src/{dependency => vendor}/interfaces/IERC20Solady.sol (100%) diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol index 91a51e0fb543..5f537c1f51ec 100644 --- a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol +++ b/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; -import { IERC20Solady } from "src/dependency/interfaces/IERC20Solady.sol"; -import { ISuperchainERC20Extensions, ISuperchainERC20Errors } from "./ISuperchainERC20.sol"; +// Interfaces +import { IERC20Solady } from "src/vendor/interfaces/IERC20Solady.sol"; +import { ISuperchainERC20Extensions, ISuperchainERC20Errors } from "src/L2/interfaces/ISuperchainERC20.sol"; /// @title IOptimismSuperchainERC20Extension /// @notice This interface is available on the OptimismSuperchainERC20 contract. diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol index 78f7ae7fc1d7..fee6a2c2f7bd 100644 --- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol +++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol @@ -1,7 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; -import { IERC20Solady } from "src/dependency/interfaces/IERC20Solady.sol"; +// Interfaces +import { IERC20Solady } from "src/vendor/interfaces/IERC20Solady.sol"; /// @title ISuperchainERC20Extensions /// @notice Interface for the extensions to the ERC20 standard that are used by SuperchainERC20. diff --git a/packages/contracts-bedrock/src/dependency/interfaces/IERC20Solady.sol b/packages/contracts-bedrock/src/vendor/interfaces/IERC20Solady.sol similarity index 100% rename from packages/contracts-bedrock/src/dependency/interfaces/IERC20Solady.sol rename to packages/contracts-bedrock/src/vendor/interfaces/IERC20Solady.sol