feat: move interfaces to a new top-level folder (ethereum-optimism#13114

)

Moves all contract interfaces to a new top-level folder. Keeps
things much cleaner and more sane for a future auto-generated
interface system.

.circleci/config.yml

@@ -265,6 +265,9 @@ jobs:
 
             # Replace import paths
             sed -i -e 's/@optimism\///' $REMOTE_ASTERISC_PATH
+            # Replace legacy interface paths
+            sed -i -e 's/src\/cannon\/interfaces\//interfaces\/cannon\//g' $REMOTE_ASTERISC_PATH
+            sed -i -e 's/src\/dispute\/interfaces\//interfaces\/dispute\//g' $REMOTE_ASTERISC_PATH
             # Replace contract name
             sed -i -e 's/contract RISCV/contract RISCV_Remote/' $REMOTE_ASTERISC_PATH
 

.semgrep/rules/sol-rules.yaml

@@ -84,18 +84,18 @@ rules:
     pattern-regex: function\s+\w+\s*\(\s*([^)]*?\b\w+\s+(?!_)(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH98.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH.sol
         - packages/contracts-bedrock/src/universal/WETH98.sol
-        - packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+        - packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
         - packages/contracts-bedrock/src/L2/SuperchainWETH.sol
-        - packages/contracts-bedrock/src/governance/interfaces/IGovernanceToken.sol
+        - packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
 
   - id: sol-style-return-arg-fmt
@@ -105,13 +105,13 @@ rules:
     pattern-regex: returns\s*(\w+\s*)?\(\s*([^)]*?\b\w+\s+(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+(?<!_)\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
 
   - id: sol-style-doc-comment
     languages: [solidity]

packages/contracts-bedrock/foundry.toml

@@ -30,7 +30,8 @@ remappings = [
   'ds-test/=lib/forge-std/lib/ds-test/src',
   'safe-contracts/=lib/safe-contracts/contracts',
   'kontrol-cheatcodes/=lib/kontrol-cheatcodes/src',
-  'gelato/=lib/automate/contracts'
+  'gelato/=lib/automate/contracts',
+  'interfaces/=interfaces'
 ]
 
 fs_permissions = [

packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol → packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 interface IL1CrossDomainMessenger is ICrossDomainMessenger {
     function PORTAL() external view returns (IOptimismPortal);

packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessengerV160.sol → packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessengerV160.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 
 /// @notice This interface corresponds to the op-contracts/v1.6.0 release of the L1CrossDomainMessenger
 /// contract, which has a semver of 2.3.0 as specified in

packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol → packages/contracts-bedrock/interfaces/L1/IL1ERC721Bridge.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IERC721Bridge } from "interfaces/universal/IERC721Bridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IL1ERC721Bridge is IERC721Bridge {
     function bridgeERC721(

packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol → packages/contracts-bedrock/interfaces/L1/IL1StandardBridge.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 interface IL1StandardBridge is IStandardBridge {
     event ERC20DepositInitiated(

packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridgeV160.sol → packages/contracts-bedrock/interfaces/L1/IL1StandardBridgeV160.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 /// @notice This interface corresponds to the op-contracts/v1.6.0 release of the L1StandardBridge
 /// contract, which has a semver of 2.1.0 as specified in

packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol → packages/contracts-bedrock/interfaces/L1/IOptimismPortal.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 
 interface IOptimismPortal {
     error BadTarget();

packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol → packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Timestamp } from "src/dispute/lib/LibUDT.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IOptimismPortal2 {
     error AlreadyFinalized();

packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol → packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Timestamp } from "src/dispute/lib/LibUDT.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
     error AlreadyFinalized();

packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol → packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {

packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol → packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 interface ISystemConfigInterop {
     event ConfigUpdate(uint256 indexed version, ISystemConfig.UpdateType indexed updateType, bytes data);

packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol → packages/contracts-bedrock/interfaces/L2/IL2CrossDomainMessenger.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IL2CrossDomainMessenger is ICrossDomainMessenger {
     function MESSAGE_VERSION() external view returns (uint16);

packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol → packages/contracts-bedrock/interfaces/L2/IL2ERC721Bridge.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
+import { IERC721Bridge } from "interfaces/universal/IERC721Bridge.sol";
 
 interface IL2ERC721Bridge is IERC721Bridge {
     function finalizeBridgeERC721(

packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol → packages/contracts-bedrock/interfaces/L2/IL2StandardBridge.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
 
 interface IL2StandardBridge is IStandardBridge {
     event DepositFinalized(

packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol → packages/contracts-bedrock/interfaces/L2/IL2StandardBridgeInterop.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IL2StandardBridgeInterop is IStandardBridge {
     error InvalidDecimals();

packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol → packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
+import { ISuperchainERC20 } from "interfaces/L2/ISuperchainERC20.sol";
 
 /// @title IOptimismSuperchainERC20
 /// @notice This interface is available on the OptimismSuperchainERC20 contract.

packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Beacon.sol → packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Beacon.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title IOptimismSuperchainERC20Beacon
 /// @notice Interface for the OptimismSuperchainERC20Beacon contract

packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Factory.sol → packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Factory.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title IOptimismSuperchainERC20Factory
 /// @notice Interface for the OptimismSuperchainERC20Factory contract

packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol → packages/contracts-bedrock/interfaces/L2/ISuperchainERC20.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
-import { IERC20Solady as IERC20 } from "src/vendor/interfaces/IERC20Solady.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
+import { IERC20Solady as IERC20 } from "interfaces/vendor/IERC20Solady.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title ISuperchainERC20
 /// @notice This interface is available on the SuperchainERC20 contract.

packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol → packages/contracts-bedrock/interfaces/L2/ISuperchainTokenBridge.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title ISuperchainTokenBridge
 /// @notice Interface for the SuperchainTokenBridge contract.

packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol → packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IWETH98 } from "interfaces/universal/IWETH98.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     error Unauthorized();

packages/contracts-bedrock/src/cannon/interfaces/IMIPS.sol → packages/contracts-bedrock/interfaces/cannon/IMIPS.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IMIPS
 /// @notice Interface for the MIPS contract.

packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol → packages/contracts-bedrock/interfaces/cannon/IMIPS2.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IMIPS2
 /// @notice Interface for the MIPS2 contract.

packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol → packages/contracts-bedrock/interfaces/dispute/IAnchorStateRegistry.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { GameType, Hash, OutputRoot } from "src/dispute/lib/Types.sol";
 
 interface IAnchorStateRegistry {

packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol → packages/contracts-bedrock/interfaces/dispute/IBigStepper.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IBigStepper
 /// @notice Describes a state machine that can perform a single instruction step, provided a prestate and an optional

packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol → packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IDelayedWETH {
     struct WithdrawalRequest {

packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol → packages/contracts-bedrock/interfaces/dispute/IDisputeGame.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IInitializable } from "src/dispute/interfaces/IInitializable.sol";
+import { IInitializable } from "interfaces/dispute/IInitializable.sol";
 import { Timestamp, GameStatus, GameType, Claim, Hash } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGame is IInitializable {

packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol → packages/contracts-bedrock/interfaces/dispute/IDisputeGameFactory.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 import { GameId, Timestamp, Claim, Hash, GameType } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGameFactory {

packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol → packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";