Fix solidity build errors

rvsol/foundry.toml

@@ -18,8 +18,9 @@ remappings = [
   'src/dispute=lib/optimism/packages/contracts-bedrock/src/dispute',
   'src/libraries=lib/optimism/packages/contracts-bedrock/src/libraries',
 
-  'forge-std/=lib/forge-std/src',
+  '@forge-std/=lib/forge-std/src',
   'ds-test/=lib/forge-std/lib/ds-test/src',
+  'forge-std/=lib/optimism/packages/contracts-bedrock/lib/forge-std/src',
 ]
 
 ffi = true

rvsol/scripts/Deploy.s.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Script } from "forge-std/Script.sol";
-import { console2 as console } from "forge-std/console2.sol";
+import { Script } from "@forge-std/Script.sol";
+import { console2 as console } from "@forge-std/console2.sol";
 
-import { Chains } from "scripts/Chains.sol";
-import { Config } from "scripts/Config.sol";
-import { Deployer } from "scripts/Deployer.sol";
+import { Chains } from "scripts/lib/Chains.sol";
+import { Config } from "scripts/lib/Config.sol";
+import { Deployer } from "scripts/lib/Deployer.sol";
 import { RISCV } from "../src/RISCV.sol";
 
 import { IBigStepper } from "@optimism/src/dispute/interfaces/IBigStepper.sol";

rvsol/scripts/Deploy_Stage_1_4.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Config } from "scripts/Config.sol";
-import { Deployer } from "scripts/Deployer.sol";
+import { Config } from "scripts/lib/Config.sol";
+import { Deployer } from "scripts/lib/Deployer.sol";
 import { RISCV } from "../src/RISCV.sol";
 import { IPreimageOracle } from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
 import { DisputeGameFactory } from "@optimism/src/dispute/DisputeGameFactory.sol";

rvsol/scripts/Artifacts.s.sol → rvsol/scripts/lib/Artifacts.s.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { console2 as console } from "forge-std/console2.sol";
-import { stdJson } from "forge-std/StdJson.sol";
-import { Vm } from "forge-std/Vm.sol";
-import { Config } from "scripts/Config.sol";
+import { console2 as console } from "@forge-std/console2.sol";
+import { stdJson } from "@forge-std/StdJson.sol";
+import { Vm } from "@forge-std/Vm.sol";
+import { Config } from "scripts/lib/Config.sol";
 
 /// @notice Represents a deployment. Is serialized to JSON as a key/value
 ///         pair. Can be accessed from within scripts.

rvsol/scripts/Config.sol → rvsol/scripts/lib/Config.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import { Vm } from "forge-std/Vm.sol";
+import { Vm } from "@forge-std/Vm.sol";
 
 import { Chains } from "scripts/Chains.sol";
 

rvsol/scripts/Deployer.sol → rvsol/scripts/lib/Deployer.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Script } from "forge-std/Script.sol";
-import { Artifacts } from "scripts/Artifacts.s.sol";
-import { Config } from "scripts/Config.sol";
+import { Script } from "@forge-std/Script.sol";
+import { Artifacts } from "scripts/lib/Artifacts.s.sol";
+import { Config } from "scripts/lib/Config.sol";
 
-import { DeployConfig } from "@optimism/scripts/DeployConfig.s.sol";
+import { DeployConfig } from "@optimism/scripts/deploy/DeployConfig.s.sol";
 
 /// @title Deployer
 /// @author tynes

rvsol/test/CommonTest.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
+import { Test } from "@forge-std/Test.sol";
+import { Vm } from "@forge-std/Vm.sol";
 
 /// @title FFIInterface
 /// @notice This contract is set into state using `etch` and therefore must not have constructor logic.

rvsol/test/RISCV.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test } from "forge-std/Test.sol";
+import { Test } from "@forge-std/Test.sol";
 import { RISCV } from "src/RISCV.sol";
 import { PreimageOracle } from "@optimism/src/cannon/PreimageOracle.sol";
 import { CommonTest } from "./CommonTest.sol";