Update solidity imports

Author: mininny

rvsol/foundry.toml

@@ -17,6 +17,7 @@ remappings = [
   # We need these remappings to use the Optimism monorepo contracts as a library.
   'src/dispute=lib/optimism/packages/contracts-bedrock/src/dispute',
   'src/libraries=lib/optimism/packages/contracts-bedrock/src/libraries',
+  'interfaces=lib/optimism/packages/contracts-bedrock/interfaces',
   'scripts/libraries=lib/optimism/packages/contracts-bedrock/scripts/libraries',
   'test/mocks=lib/optimism/packages/contracts-bedrock/test/mocks',
 

rvsol/scripts/Deploy.s.sol

@@ -8,14 +8,14 @@ import { Chains } from "scripts/lib/Chains.sol";
 import { Config } from "scripts/lib/Config.sol";
 import { Deployer } from "scripts/lib/Deployer.sol";
 
-import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";
-import { IPreimageOracle } from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
-import { IDisputeGameFactory } from "@optimism/src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDisputeGame } from "@optimism/src/dispute/interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "@optimism/src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 import { FaultDisputeGame } from "@optimism/src/dispute/FaultDisputeGame.sol";
-import { IDelayedWETH } from "@optimism/src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "@optimism/src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 import "@optimism/src/dispute/lib/Types.sol";
 
 contract Deploy is Deployer {

rvsol/scripts/Deploy_Stage_1_4.sol

@@ -4,14 +4,14 @@ pragma solidity ^0.8.15;
 import { Config } from "scripts/lib/Config.sol";
 import { Deployer } from "scripts/lib/Deployer.sol";
 import { PreimageOracle } from "src/cannon/PreimageOracle.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 import { FaultDisputeGame } from "@optimism/src/dispute/FaultDisputeGame.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "@optimism/src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 import { ChainAssertions } from "@optimism/scripts/deploy/ChainAssertions.sol";
 import { Types } from "@optimism/scripts/libraries/Types.sol";
 
@@ -20,7 +20,7 @@ import { AddressManager } from "@optimism/src/legacy/AddressManager.sol";
 import { Proxy } from "@optimism/src/universal/Proxy.sol";
 import { EIP1967Helper } from "@optimism/test/mocks/EIP1967Helper.sol";
 import { Chains } from "@optimism/scripts/libraries/Chains.sol";
-import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 import "@optimism/src/dispute/lib/Types.sol";
 import { console2 as console } from "forge-std/console2.sol";
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";

rvsol/scripts/lib/Artifacts.s.sol

@@ -10,7 +10,7 @@ import { StorageSlot } from "scripts/libraries/ForgeArtifacts.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 import { LibString } from "@solady/utils/LibString.sol";
 import { ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
 import { Process } from "scripts/libraries/Process.sol";
 
 /// @notice Represents a deployment. Is serialized to JSON as a key/value

rvsol/src/RISCV.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { IPreimageOracle } from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
-import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";
+import { IPreimageOracle } from "@optimism/interfaces/cannon/IPreimageOracle.sol";
+import { IBigStepper } from "@optimism/interfaces/dispute/IBigStepper.sol";
 
 /// @title RISCV
 /// @notice The RISCV contract emulates a single RISCV hart cycle statelessly, using memory proofs to verify the

rvsol/test/RISCV.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import { Test } from "@forge-std/Test.sol";
-import { IPreimageOracle } from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
-import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 import { PreimageOracle } from "@optimism/src/cannon/PreimageOracle.sol";
 import { DeployUtils } from "@optimism/scripts/libraries/DeployUtils.sol";
 import { CommonTest } from "./CommonTest.sol";