remove optimism remapping

Author: jackchuma

remappings.txt

@@ -1,4 +1,3 @@
-@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts
 @solady/=lib/solady/src/

script/deploy/l1/SetGasLimit.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import {Vm} from "lib/forge-std/src/Vm.sol";
-import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
+import {SystemConfig} from "lib/optimism/packages/contracts-bedrock/src/L1/SystemConfig.sol";
 
 import {MultisigScript, IMulticall3, IGnosisSafe, Simulation} from "../../universal/MultisigScript.sol";
 

script/deploy/l1/tests/DeployTestTokenContracts.s.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 // solhint-disable no-console
-import {console} from "forge-std/console.sol";
-import {Script} from "forge-std/Script.sol";
+import {console} from "lib/forge-std/src/console.sol";
+import {Script} from "lib/forge-std/src/Script.sol";
 import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 import {ERC721PresetMinterPauserAutoId} from
     "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol";

script/deploy/l1/tests/TestDeposits.s.sol

@@ -7,8 +7,8 @@ import {Script} from "lib/forge-std/src/Script.sol";
 import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 import {ERC721PresetMinterPauserAutoId} from
     "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol";
-import {L1ERC721Bridge} from "@eth-optimism-bedrock/src/L1/L1ERC721Bridge.sol";
-import {L1StandardBridge} from "@eth-optimism-bedrock/src/L1/L1StandardBridge.sol";
+import {L1ERC721Bridge} from "lib/optimism/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol";
+import {L1StandardBridge} from "lib/optimism/packages/contracts-bedrock/src/L1/L1StandardBridge.sol";
 
 // Deposits funds to Base Mainnet to test its functionality
 contract DeployTestContracts is Script {

script/deploy/l2/tests/DeployTestTokenContracts.s.sol

@@ -4,9 +4,11 @@ pragma solidity 0.8.15;
 // solhint-disable no-console
 import {console} from "lib/forge-std/src/console.sol";
 import {Script} from "lib/forge-std/src/Script.sol";
-import {Predeploys} from "@eth-optimism-bedrock/src/libraries/Predeploys.sol";
-import {OptimismMintableERC20Factory} from "@eth-optimism-bedrock/src/universal/OptimismMintableERC20Factory.sol";
-import {OptimismMintableERC721Factory} from "@eth-optimism-bedrock/src/universal/OptimismMintableERC721Factory.sol";
+import {Predeploys} from "lib/optimism/packages/contracts-bedrock/src/libraries/Predeploys.sol";
+import {OptimismMintableERC20Factory} from
+    "lib/optimism/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol";
+import {OptimismMintableERC721Factory} from
+    "lib/optimism/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol";
 
 // Deploys test token contracts on L2 to test Base Mainnet functionality
 contract DeployTestTokenContracts is Script {

script/deploy/l2/tests/TestWithdraw.s.sol

@@ -4,9 +4,9 @@ pragma solidity 0.8.15;
 // solhint-disable no-console
 import {console} from "lib/forge-std/src/console.sol";
 import {Script} from "lib/forge-std/src/Script.sol";
-import {Predeploys} from "@eth-optimism-bedrock/src/libraries/Predeploys.sol";
-import {L2ERC721Bridge} from "@eth-optimism-bedrock/src/L2/L2ERC721Bridge.sol";
-import {L2StandardBridge} from "@eth-optimism-bedrock/src/L2/L2StandardBridge.sol";
+import {Predeploys} from "lib/optimism/packages/contracts-bedrock/src/libraries/Predeploys.sol";
+import {L2ERC721Bridge} from "lib/optimism/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol";
+import {L2StandardBridge} from "lib/optimism/packages/contracts-bedrock/src/L2/L2StandardBridge.sol";
 
 // Withdraws tokens from L2 to L1 to test Base Mainnet's bridging functionality
 contract TestWithdraw is Script {

script/universal/Signatures.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 // solhint-disable no-console
 import {console} from "lib/forge-std/src/console.sol";
-import {Bytes} from "@eth-optimism-bedrock/src/libraries/Bytes.sol";
+import {Bytes} from "lib/optimism/packages/contracts-bedrock/src/libraries/Bytes.sol";
 import {LibSort} from "@solady/utils/LibSort.sol";
 
 import {IGnosisSafe} from "./IGnosisSafe.sol";

src/revenue-share/BalanceTracker.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
-import {SafeCall} from "@eth-optimism-bedrock/src/libraries/SafeCall.sol";
+import {SafeCall} from "lib/optimism/packages/contracts-bedrock/src/libraries/SafeCall.sol";
 
 /// @title BalanceTracker
 ///

src/revenue-share/FeeDisburser.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.15;
 
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {L2StandardBridge} from "@eth-optimism-bedrock/src/L2/L2StandardBridge.sol";
-import {Predeploys} from "@eth-optimism-bedrock/src/libraries/Predeploys.sol";
-import {SafeCall} from "@eth-optimism-bedrock/src/libraries/SafeCall.sol";
-import {FeeVault} from "@eth-optimism-bedrock/src/universal/FeeVault.sol";
+import {L2StandardBridge} from "lib/optimism/packages/contracts-bedrock/src/L2/L2StandardBridge.sol";
+import {Predeploys} from "lib/optimism/packages/contracts-bedrock/src/libraries/Predeploys.sol";
+import {SafeCall} from "lib/optimism/packages/contracts-bedrock/src/libraries/SafeCall.sol";
+import {FeeVault} from "lib/optimism/packages/contracts-bedrock/src/universal/FeeVault.sol";
 
 /// @title FeeDisburser
 ///

test/Challenger1of2.t.sol

@@ -5,9 +5,9 @@ pragma solidity ^0.8.15;
 import {console} from "forge-std/console.sol";
 import {Test, StdUtils} from "forge-std/Test.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
-import {L2OutputOracle} from "@eth-optimism-bedrock/src/L1/L2OutputOracle.sol";
-import {ProxyAdmin} from "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol";
-import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
+import {L2OutputOracle} from "lib/optimism/packages/contracts-bedrock/src/L1/L2OutputOracle.sol";
+import {ProxyAdmin} from "lib/optimism/packages/contracts-bedrock/src/universal/ProxyAdmin.sol";
+import {Proxy} from "lib/optimism/packages/contracts-bedrock/src/universal/Proxy.sol";
 
 import {Challenger1of2} from "src/Challenger1of2.sol";