feat(ct): add checks for unused imports (#12348)

A few things in this commit:
- Adds a new check for unused imports in contracts
- Cleans up contracts based on that check
- Removes several files that aren't being used anymore

packages/contracts-bedrock/justfile

@@ -84,10 +84,6 @@ gas-snapshot-no-build:
 # Generates a gas snapshot.
 gas-snapshot: build-go-ffi gas-snapshot-no-build
 
-# Checks that the state diff is up to date.
-statediff:
-  ./scripts/utils/statediff.sh && git diff --exit-code
-
 # Generates default Kontrol summary.
 kontrol-summary:
   ./test/kontrol/scripts/make-summary-deployment.sh
@@ -176,6 +172,13 @@ lint-forge-tests-check:
 lint-check:
   forge fmt --check
 
+# Checks for unused imports in Solidity contracts. Does not build contracts.
+unused-imports-check-no-build:
+  go run ./scripts/checks/unused-imports
+
+# Checks for unused imports in Solidity contracts.
+unused-imports-check: build unused-imports-check-no-build
+
 # Checks that the deploy configs are valid.
 validate-deploy-configs:
   ./scripts/checks/check-deploy-configs.sh
@@ -189,8 +192,17 @@ validate-spacers: build validate-spacers-no-build
 
 # TODO: Also run lint-forge-tests-check but we need to fix the test names first.
 # Runs all checks.
-check: gas-snapshot-check-no-build kontrol-deployment-check snapshots-check-no-build lint-check semver-diff-check-no-build semver-natspec-check-no-build validate-deploy-configs validate-spacers-no-build interfaces-check-no-build
-
+check:
+  @just gas-snapshot-check-no-build \
+  unused-imports-check-no-build \
+  kontrol-deployment-check \
+  snapshots-check-no-build \
+  lint-check \
+  semver-diff-check-no-build \
+  semver-natspec-check-no-build \
+  validate-deploy-configs \
+  validate-spacers-no-build \
+  interfaces-check-no-build
 
 ########################################################
 #                      DEV TOOLS                       #

packages/contracts-bedrock/scripts/Artifacts.s.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { Executables } from "scripts/libraries/Executables.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Config } from "scripts/libraries/Config.sol";
 import { StorageSlot } from "scripts/libraries/ForgeArtifacts.sol";

packages/contracts-bedrock/scripts/DeployOPChain.s.sol

@@ -25,7 +25,7 @@ import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { Claim, Duration, GameType, GameTypes, Hash, OutputRoot } from "src/dispute/lib/Types.sol";
+import { Claim, Duration, GameType, GameTypes, Hash } from "src/dispute/lib/Types.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";

packages/contracts-bedrock/scripts/L2Genesis.s.sol

@@ -2,15 +2,12 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Scripts
 import { Deployer } from "scripts/deploy/Deployer.sol";
 import { Config, OutputMode, OutputModeUtils, Fork, ForkUtils, LATEST_FORK } from "scripts/libraries/Config.sol";
-import { Artifacts } from "scripts/Artifacts.s.sol";
-import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { SetPreinstalls } from "scripts/SetPreinstalls.s.sol";
 

packages/contracts-bedrock/scripts/checks/unused-imports/main.go

+package main
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+	"sync"
+	"sync/atomic"
+)
+
+var importPattern = regexp.MustCompile(`import\s*{([^}]+)}`)
+var asPattern = regexp.MustCompile(`(\S+)\s+as\s+(\S+)`)
+
+func main() {
+	if err := run(); err != nil {
+		writeStderr("an error occurred: %v", err)
+		os.Exit(1)
+	}
+}
+
+func writeStderr(msg string, args ...any) {
+	_, _ = fmt.Fprintf(os.Stderr, msg+"\n", args...)
+}
+
+func run() error {
+	cwd, err := os.Getwd()
+	if err != nil {
+		return fmt.Errorf("failed to get current working directory: %w", err)
+	}
+
+	var hasErr int32
+	var outMtx sync.Mutex
+	fail := func(msg string, args ...any) {
+		outMtx.Lock()
+		writeStderr("❌  "+msg, args...)
+		outMtx.Unlock()
+		atomic.StoreInt32(&hasErr, 1)
+	}
+
+	dirs := []string{"src", "scripts", "test"}
+	sem := make(chan struct{}, runtime.NumCPU())
+
+	for _, dir := range dirs {
+		dirPath := filepath.Join(cwd, dir)
+		if _, err := os.Stat(dirPath); errors.Is(err, os.ErrNotExist) {
+			continue
+		}
+
+		err := filepath.Walk(dirPath, func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+			if !info.IsDir() && strings.HasSuffix(info.Name(), ".sol") {
+				sem <- struct{}{}
+				go func() {
+					defer func() { <-sem }()
+					processFile(path, fail)
+				}()
+			}
+			return nil
+		})
+
+		if err != nil {
+			return fmt.Errorf("failed to walk directory %s: %w", dir, err)
+		}
+	}
+
+	for i := 0; i < cap(sem); i++ {
+		sem <- struct{}{}
+	}
+
+	if atomic.LoadInt32(&hasErr) == 1 {
+		return errors.New("unused imports check failed, see logs above")
+	}
+
+	return nil
+}
+
+func processFile(filePath string, fail func(string, ...any)) {
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		fail("%s: failed to read file: %v", filePath, err)
+		return
+	}
+
+	imports := findImports(string(content))
+	unusedImports := checkUnusedImports(imports, string(content))
+
+	if len(unusedImports) > 0 {
+		fail("File: %s\nUnused imports:", filePath)
+		for _, unused := range unusedImports {
+			fail("  - %s", unused)
+		}
+	}
+}
+
+func findImports(content string) []string {
+	var imports []string
+	matches := importPattern.FindAllStringSubmatch(content, -1)
+	for _, match := range matches {
+		if len(match) > 1 {
+			importList := strings.Split(match[1], ",")
+			for _, imp := range importList {
+				imports = append(imports, strings.TrimSpace(imp))
+			}
+		}
+	}
+	return imports
+}
+
+func checkUnusedImports(imports []string, content string) []string {
+	var unusedImports []string
+	for _, imp := range imports {
+		searchTerm := imp
+		displayName := imp
+
+		if match := asPattern.FindStringSubmatch(imp); len(match) > 2 {
+			searchTerm = match[2]
+			displayName = fmt.Sprintf("%s as %s", match[1], match[2])
+		}
+
+		if !isImportUsed(searchTerm, content) {
+			unusedImports = append(unusedImports, displayName)
+		}
+	}
+	return unusedImports
+}
+
+func isImportUsed(imp, content string) bool {
+	scanner := bufio.NewScanner(strings.NewReader(content))
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(strings.TrimSpace(line), "//") {
+			continue
+		}
+		if strings.Contains(line, "import") {
+			continue
+		}
+		if strings.Contains(line, imp) {
+			return true
+		}
+	}
+	return false
+}

packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol

@@ -7,8 +7,6 @@ import { console2 as console } from "forge-std/console2.sol";
 
 // Scripts
 import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
-import { Deployer } from "scripts/deploy/Deployer.sol";
-import { ISystemConfigV0 } from "scripts/interfaces/ISystemConfigV0.sol";
 import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
 
 // Libraries

packages/contracts-bedrock/scripts/deploy/Deploy.s.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 // Testing
 import { VmSafe } from "forge-std/Vm.sol";
-import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
@@ -40,17 +39,15 @@ import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
 import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
 import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";

packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol

@@ -6,7 +6,6 @@ import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { Executables } from "scripts/libraries/Executables.sol";
 import { Process } from "scripts/libraries/Process.sol";
-import { Chains } from "scripts/libraries/Chains.sol";
 import { Config, Fork, ForkUtils } from "scripts/libraries/Config.sol";
 
 /// @title DeployConfig

packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import { console2 as console } from "forge-std/console2.sol";
-import { stdJson } from "forge-std/StdJson.sol";
 
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { GnosisSafeProxyFactory as SafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";

packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol

-// SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.0;
-
-/// @title Enum - Collection of enums used in Safe contracts.
-/// @author Richard Meissner - @rmeissner
-abstract contract Enum {
-    enum Operation {
-        Call,
-        DelegateCall
-    }
-}
-
-/// @title IGnosisSafe - Gnosis Safe Interface
-interface IGnosisSafe {
-    event AddedOwner(address owner);
-    event ApproveHash(bytes32 indexed approvedHash, address indexed owner);
-    event ChangedFallbackHandler(address handler);
-    event ChangedGuard(address guard);
-    event ChangedThreshold(uint256 threshold);
-    event DisabledModule(address module);
-    event EnabledModule(address module);
-    event ExecutionFailure(bytes32 txHash, uint256 payment);
-    event ExecutionFromModuleFailure(address indexed module);
-    event ExecutionFromModuleSuccess(address indexed module);
-    event ExecutionSuccess(bytes32 txHash, uint256 payment);
-    event RemovedOwner(address owner);
-    event SafeReceived(address indexed sender, uint256 value);
-    event SafeSetup(
-        address indexed initiator, address[] owners, uint256 threshold, address initializer, address fallbackHandler
-    );
-    event SignMsg(bytes32 indexed msgHash);
-
-    function VERSION() external view returns (string memory);
-    function addOwnerWithThreshold(address owner, uint256 _threshold) external;
-    function approveHash(bytes32 hashToApprove) external;
-    function approvedHashes(address, bytes32) external view returns (uint256);
-    function changeThreshold(uint256 _threshold) external;
-    function checkNSignatures(
-        bytes32 dataHash,
-        bytes memory data,
-        bytes memory signatures,
-        uint256 requiredSignatures
-    )
-        external
-        view;
-    function checkSignatures(bytes32 dataHash, bytes memory data, bytes memory signatures) external view;
-    function disableModule(address prevModule, address module) external;
-    function domainSeparator() external view returns (bytes32);
-    function enableModule(address module) external;
-    function encodeTransactionData(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        uint256 _nonce
-    )
-        external
-        view
-        returns (bytes memory);
-    function execTransaction(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        bytes memory signatures
-    )
-        external
-        payable
-        returns (bool success);
-    function execTransactionFromModule(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation
-    )
-        external
-        returns (bool success);
-    function execTransactionFromModuleReturnData(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation
-    )
-        external
-        returns (bool success, bytes memory returnData);
-    function getChainId() external view returns (uint256);
-    function getModulesPaginated(
-        address start,
-        uint256 pageSize
-    )
-        external
-        view
-        returns (address[] memory array, address next);
-    function getOwners() external view returns (address[] memory);
-    function getStorageAt(uint256 offset, uint256 length) external view returns (bytes memory);
-    function getThreshold() external view returns (uint256);
-    function getTransactionHash(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        uint256 _nonce
-    )
-        external
-        view
-        returns (bytes32);
-    function isModuleEnabled(address module) external view returns (bool);
-    function isOwner(address owner) external view returns (bool);
-    function nonce() external view returns (uint256);
-    function removeOwner(address prevOwner, address owner, uint256 _threshold) external;
-    function requiredTxGas(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation
-    )
-        external
-        returns (uint256);
-    function setFallbackHandler(address handler) external;
-    function setGuard(address guard) external;
-    function setup(
-        address[] memory _owners,
-        uint256 _threshold,
-        address to,
-        bytes memory data,
-        address fallbackHandler,
-        address paymentToken,
-        uint256 payment,
-        address paymentReceiver
-    )
-        external;
-    function signedMessages(bytes32) external view returns (uint256);
-    function simulateAndRevert(address targetContract, bytes memory calldataPayload) external;
-    function swapOwner(address prevOwner, address oldOwner, address newOwner) external;
-}

packages/contracts-bedrock/scripts/interfaces/ISystemConfigV0.sol

-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-
-/// @title ISystemConfigV0
-/// @notice Minimal interface of the Legacy SystemConfig containing only getters.
-///         Based on
-/// https://github.com/ethereum-optimism/optimism/blob/f54a2234f2f350795552011f35f704a3feb56a08/packages/contracts-bedrock/src/L1/SystemConfig.sol
-interface ISystemConfigV0 {
-    function owner() external view returns (address);
-    function VERSION() external view returns (uint256);
-    function overhead() external view returns (uint256);
-    function scalar() external view returns (uint256);
-    function batcherHash() external view returns (bytes32);
-    function gasLimit() external view returns (uint64);
-    function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
-    function unsafeBlockSigner() external view returns (address);
-}

packages/contracts-bedrock/scripts/utils/restructure_tests.py

-import os
-import shutil
-
-
-def mimic_directory_structure(src_folder: str, test_folder: str) -> None:
-    """
-    This function takes a source folder and a test folder as input, and restructures
-    the test folder to match the directory structure of the source folder.
-
-    Only moves test files ("<name>.t.sol") at the root level of the `test` folder.
-    """
-
-    # Walk through the src folder and collect a list of all .sol files
-    sol_files = []
-    for root, _, files in os.walk(src_folder):
-        for file in files:
-            if file.endswith(".sol"):
-                sol_files.append(os.path.join(root, file))
-
-    # Iterate through each .t.sol file in the test folder
-    for test_file in os.listdir(test_folder):
-        if test_file.endswith(".t.sol"):
-            # Construct the corresponding .sol file name
-            sol_file = test_file.replace(".t.sol", ".sol")
-
-            # Find the full path of the corresponding .sol file in the src folder
-            src_path = None
-            for sol_path in sol_files:
-                if sol_path.endswith(os.path.sep + sol_file):
-                    src_path = sol_path
-                    break
-
-            if src_path:
-                # Calculate the relative path from the src folder to the .sol file
-                rel_path = os.path.relpath(src_path, src_folder)
-
-                # Construct the destination path within the test folder
-                dest_path = os.path.join(
-                    test_folder, rel_path).replace(".sol", ".t.sol")
-
-                # Create the directory structure if it doesn't exist
-                dest_dir = os.path.dirname(dest_path)
-                os.makedirs(dest_dir, exist_ok=True)
-
-                # Copy the .t.sol file to the destination folder
-                shutil.move(os.path.join(test_folder, test_file), dest_path)
-                print(f"Moved {test_file} to {dest_path}")
-            else:
-                print(f"No corresponding .sol file found for {test_file}")
-
-
-# Specify the source and test folder paths
-src_folder = "src"
-test_folder = "test"
-
-# Call the mimic_directory_structure function
-mimic_directory_structure(src_folder, test_folder)

packages/contracts-bedrock/scripts/utils/statediff.sh

-#!/usr/bin/env bash
-set -euo pipefail
-
-echo "> Deploying contracts to generate state diff (non-broadcast)"
-forge script -vvv scripts/deploy/Deploy.s.sol:Deploy --sig 'runWithStateDiff()'

packages/contracts-bedrock/semver-lock.json

@@ -12,16 +12,16 @@
     "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
   },
   "src/L1/L1ERC721Bridge.sol": {
-    "initCodeHash": "0xfb8b3c51e1790a0b951eaba05ed7368309fbfc7ddc558b4ce1de29da087fb4bd",
-    "sourceCodeHash": "0xcb125e7f640cf5f372c7bf4f8e36150328914ceef99b6fd5d65ae12b6db430b5"
+    "initCodeHash": "0x63dc4da75200f4b968f57e27e81834e6eb3f6625826410882526ab1eec7847ff",
+    "sourceCodeHash": "0xfec29cfbb7aa05473e32a6c2484deebfc1ff50c0e08c42e8ee70696ad701ceaa"
   },
   "src/L1/L1StandardBridge.sol": {
     "initCodeHash": "0x2868b09ecbe9f2bbc885605c2886b4c79f1c8e4171626c63776603b1b84698a8",
     "sourceCodeHash": "0xc03da137b3ea72e0109fb284229283b21a0303104afbe37d2fe86ad806392a7f"
   },
   "src/L1/L2OutputOracle.sol": {
-    "initCodeHash": "0x433fac9de52d8ce8fc3471b78ef6cc9cff1019f480c9ad91b6e09ab8738a8edb",
-    "sourceCodeHash": "0xde4df0f9633dc0cdb1c9f634003ea5b0f7c5c1aebc407bc1b2f44c0ecf938649"
+    "initCodeHash": "0x1182bfb87c4ab399b912ca7fe18cdbf4b24c414e078fb0a55bd3c44d442d3ed1",
+    "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
     "initCodeHash": "0xd58cb3978affc5c1457cdd498ff8420c90aef804d4c3b62cf42ab2691986d6d2",
@@ -40,8 +40,8 @@
     "sourceCodeHash": "0x6401b81f04093863557ef46192f56793daa0d412618065383ab353b2ed2929d8"
   },
   "src/L1/ProtocolVersions.sol": {
-    "initCodeHash": "0xf7a9ed8c772cfb1234988fd6fd195dc21615b216bb39e728e7699b875040d902",
-    "sourceCodeHash": "0x92f15d62361bffc305f0db48a5676329f8e5ed2e454f8c8ff83ef7d3667d7f01"
+    "initCodeHash": "0xefd4806e8737716d5d2022ca2e9e9fba0a0cb5714b026166b58e472222c7d15f",
+    "sourceCodeHash": "0x15205131bf420aa6d03c558bb75dd49cd7439caed7ccdcbfd89c4170a48c94f5"
   },
   "src/L1/SuperchainConfig.sol": {
     "initCodeHash": "0xfca12d9016c746e5c275b186e0ca40cfd65cf45a5665aab7589a669fea3abb47",
@@ -84,12 +84,12 @@
     "sourceCodeHash": "0xc7cda130f2bb3648e04d5a480082aa1789e16456c1280954d822b05d30100b2d"
   },
   "src/L2/L2CrossDomainMessenger.sol": {
-    "initCodeHash": "0xcc4527d21cceeedbb3cbf8e7028e22fe12bc1ab30365dbebd0713499451b959d",
-    "sourceCodeHash": "0x66e4ae82b58693cb394d70159308d50270ccdd56c495c5e2aaf55de1fdc78695"
+    "initCodeHash": "0xc496495496b96ea0eaf417c5e56b295836c12db3e6aafe2e607563e7a50b5b65",
+    "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0x827077e1a0ce6c8f9ee1196c409ea77d831efd440992b3969b05259083cdf0bd",
-    "sourceCodeHash": "0x51a44e1fcef9483cc58ba0c9895cb3eec675785145428ece9aa7acd1a1a5b57c"
+    "initCodeHash": "0x558fff5939a26b9d5d86e6b907d9dd9c7c917eaef7657a8b5acfeb58de1442f0",
+    "sourceCodeHash": "0xca9acd19fd5f42e6a7a5b1de6359f2d841814fb54d377664c2fe9c3f9c6be34a"
   },
   "src/L2/L2StandardBridge.sol": {
     "initCodeHash": "0x651eed10044d0b19b7e4eba864345df15e252be1401f39a552ec0d2f9c4df064",
@@ -108,8 +108,8 @@
     "sourceCodeHash": "0xfea53344596d735eff3be945ed1300dc75a6f8b7b2c02c0043af5b0036f5f239"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0xe3dbb0851669708901a4c6bb7ad7d55f9896deeec02cbe53ac58d689ff95b88b",
-    "sourceCodeHash": "0xe853817da47d32b4ec5bb5392405278c82a1e9620aef377491dcb371fbbe682f"
+    "initCodeHash": "0x965af580568bad2b47d04c6ea536490aa263e9fcb5fb43e6c8bc00929fda3df5",
+    "sourceCodeHash": "0x9de349519900b1051f45d507b2fac1cf3f3ae8e2cfb1ceb56875a7ace1cb6ab8"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
     "initCodeHash": "0x99ce8095b23c124850d866cbc144fee6cee05dbc6bb5d83acadfe00b90cf42c7",
@@ -132,8 +132,8 @@
     "sourceCodeHash": "0x2ab6be69795109a1ee04c5693a34d6ce0ff90b62e404cdeb18178bab18d06784"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0xa9a9db7bedf25800f20c947df10310c64beb2ead8eb6be991c83189e975df0fe",
-    "sourceCodeHash": "0x83aabf115ac0ad407868e633a521602c41d86864d82198e6abbf69d33daaea65"
+    "initCodeHash": "0x3e426acc53ebd6ad01037ea321410fab2df08e1d1183195c15be9ff48fef4d44",
+    "sourceCodeHash": "0xaf7416f27db1b393092f51d290a29293184105bc5f0d89cd6048f687cebc7d69"
   },
   "src/cannon/MIPS2.sol": {
     "initCodeHash": "0xbb203b0d83efddfa0f664dbc63ec55844318b48fe8133758307f64e87c892a47",
@@ -156,8 +156,8 @@
     "sourceCodeHash": "0xc8f21c777b2c5a37c2d2f92e8eeceba3b231b500a7d9cb0b607b774478f8be6b"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0xdb724dfd12dcea804d1adbc5a7e919625615c62b940035cf4b9115ea3a63e0ae",
-    "sourceCodeHash": "0x223428ee91532af397cef72356430ff59221e0ac0cbf697a881d36bb1d672392"
+    "initCodeHash": "0x04e6c36ee49f7744e5277c1d83ba78616ef3e3cef62406d32e2d9c72bca2010a",
+    "sourceCodeHash": "0x9b9e971748d253790b3ce9da0b1cbbcb6df77bb252ee2d1c5088bb6bae6491aa"
   },
   "src/legacy/DeployerWhitelist.sol": {
     "initCodeHash": "0x0b8177ed75b69eddbb9ce6537683f69a9935efed86a1d6faa8feaafbd151c1bd",

packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol

@@ -6,7 +6,6 @@ import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
@@ -29,8 +28,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
     ISuperchainConfig public superchainConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.1.1-beta.3
-    string public constant version = "2.1.1-beta.3";
+    /// @custom:semver 2.1.1-beta.4
+    string public constant version = "2.1.1-beta.4";
 
     /// @notice Constructs the L1ERC721Bridge contract.
     constructor() ERC721Bridge() {

packages/contracts-bedrock/src/L1/L2OutputOracle.sol

@@ -6,7 +6,6 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -61,8 +60,8 @@ contract L2OutputOracle is Initializable, ISemver {
     event OutputsDeleted(uint256 indexed prevNextOutputIndex, uint256 indexed newNextOutputIndex);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.8.1-beta.1
-    string public constant version = "1.8.1-beta.1";
+    /// @custom:semver 1.8.1-beta.2
+    string public constant version = "1.8.1-beta.2";
 
     /// @notice Constructs the L2OutputOracle contract. Initializes variables to the same values as
     ///         in the getting-started config.

packages/contracts-bedrock/src/L1/ProtocolVersions.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Storage } from "src/libraries/Storage.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 /// @notice ProtocolVersion is a numeric identifier of the protocol version.
 type ProtocolVersion is uint256;
@@ -37,8 +36,8 @@ contract ProtocolVersions is OwnableUpgradeable, ISemver {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.2
-    string public constant version = "1.0.1-beta.2";
+    /// @custom:semver 1.0.1-beta.3
+    string public constant version = "1.0.1-beta.3";
 
     /// @notice Constructs the ProtocolVersion contract. Cannot set
     ///         the owner to `address(0)` due to the Ownable contract's

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

@@ -4,7 +4,6 @@ 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";
 
 /// @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/L2/L2CrossDomainMessenger.sol

@@ -7,8 +7,6 @@ import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 // Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Constants } from "src/libraries/Constants.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -22,8 +20,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 ///         L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
 ///         level message passing contracts.
 contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
-    /// @custom:semver 2.1.1-beta.3
-    string public constant version = "2.1.1-beta.3";
+    /// @custom:semver 2.1.1-beta.4
+    string public constant version = "2.1.1-beta.4";
 
     /// @notice Constructs the L2CrossDomainMessenger contract.
     constructor() CrossDomainMessenger() {

packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol

@@ -6,7 +6,6 @@ import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
 
 // Libraries
 import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
@@ -27,8 +26,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.7.1-beta.2
-    string public constant version = "1.7.1-beta.2";
+    /// @custom:semver 1.7.1-beta.3
+    string public constant version = "1.7.1-beta.3";
 
     /// @notice Constructs the L2ERC721Bridge contract.
     constructor() ERC721Bridge() {

packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.25;
 
 import { IOptimismSuperchainERC20Extension } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ERC20 } from "@solady/tokens/ERC20.sol";
@@ -63,8 +62,8 @@ contract OptimismSuperchainERC20 is
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.4
-    string public constant version = "1.0.0-beta.4";
+    /// @custom:semver 1.0.0-beta.5
+    string public constant version = "1.0.0-beta.5";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {

packages/contracts-bedrock/src/cannon/MIPS.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
-import { PreimageKeyLib } from "./PreimageKeyLib.sol";
 import { MIPSInstructions as ins } from "src/cannon/libraries/MIPSInstructions.sol";
 import { MIPSSyscalls as sys } from "src/cannon/libraries/MIPSSyscalls.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
@@ -45,8 +44,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.2
-    string public constant version = "1.2.1-beta.2";
+    /// @custom:semver 1.2.1-beta.3
+    string public constant version = "1.2.1-beta.3";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;

packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol

@@ -14,7 +14,6 @@ import "src/dispute/lib/Errors.sol";
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IBigStepper, IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 
@@ -104,8 +103,8 @@ contract FaultDisputeGame is Clone, ISemver {
     uint256 internal constant HEADER_BLOCK_NUMBER_INDEX = 8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.3
-    string public constant version = "1.3.1-beta.3";
+    /// @custom:semver 1.3.1-beta.4
+    string public constant version = "1.3.1-beta.4";
 
     /// @notice The starting timestamp of the game
     Timestamp public createdAt;

packages/contracts-bedrock/src/legacy/interfaces/IDeployerWhitelist.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-
 /// @title IDeployerWhitelist
 /// @notice Interface for the DeployerWhitelist contract.
 interface IDeployerWhitelist {

packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol

@@ -3,14 +3,13 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
-import { Reverter, ConfigurableCaller } from "test/mocks/Callers.sol";
+import { Reverter } from "test/mocks/Callers.sol";
 
 // Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 // Target contract dependencies
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";

packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol

@@ -11,7 +11,6 @@ import { StandardBridge } from "src/universal/StandardBridge.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Constants } from "src/libraries/Constants.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 // Interfaces

packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol

@@ -9,7 +9,6 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 // Target contract dependencies
 import { Proxy } from "src/universal/Proxy.sol";

packages/contracts-bedrock/test/L1/ProtocolVersions.t.sol

@@ -5,9 +5,6 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
-// Libraries
-import { Constants } from "src/libraries/Constants.sol";
-
 // Interfaces
 import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";

packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol

@@ -3,10 +3,6 @@ pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
 
-// Libraries
-import { Types } from "src/libraries/Types.sol";
-import { Hashing } from "src/libraries/Hashing.sol";
-
 // Target contract dependencies
 import { Proxy } from "src/universal/Proxy.sol";
 

packages/contracts-bedrock/test/L1/SystemConfig.t.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol

@@ -3,14 +3,13 @@ pragma solidity 0.8.15;
 
 // Testing
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
-import { Reverter, ConfigurableCaller } from "test/mocks/Callers.sol";
+import { Reverter } from "test/mocks/Callers.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Types } from "src/libraries/Types.sol";
-import { Constants } from "src/libraries/Constants.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 // Interfaces

packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { console } from "forge-std/console.sol";
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 
 // Contracts

packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol

@@ -4,10 +4,6 @@ pragma solidity 0.8.15;
 // Testing
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 
-// Libraries
-// TODO: Replace Predeploys.OPTIMISM_SUPERCHAIN_ERC20_FACTORY with optimismSuperchainERC20Factory
-import { Predeploys } from "src/libraries/Predeploys.sol";
-
 // Interfaces
 import { IL2StandardBridgeInterop, IMintableAndBurnable } from "src/L2/interfaces/IL2StandardBridgeInterop.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol

@@ -9,7 +9,6 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { IERC20 } from "@openzeppelin/contracts-v5/token/ERC20/IERC20.sol";
 import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
-import { ERC1967Proxy } from "@openzeppelin/contracts-v5/proxy/ERC1967/ERC1967Proxy.sol";
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 import { IERC165 } from "@openzeppelin/contracts-v5/utils/introspection/IERC165.sol";
 import { IBeacon } from "@openzeppelin/contracts-v5/proxy/beacon/IBeacon.sol";

packages/contracts-bedrock/test/L2/Predeploys.t.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 

packages/contracts-bedrock/test/L2/Preinstalls.t.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { Bytes } from "src/libraries/Bytes.sol";
-import { console2 as console } from "forge-std/console2.sol";
 import { IEIP712 } from "src/universal/interfaces/IEIP712.sol";
 
 /// @title PreinstallsTest

packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.15;
 
 // Testing
 import { Test } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
 import { DisputeGameFactory_Init } from "test/dispute/DisputeGameFactory.t.sol";
 import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
 
@@ -13,12 +12,11 @@ import { PreimageOracle } from "src/cannon/PreimageOracle.sol";
 import { DelayedWETH } from "src/dispute/DelayedWETH.sol";
 
 // Libraries
-import { Types } from "src/libraries/Types.sol";
 import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { IBigStepper, IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
+import { IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
 

packages/contracts-bedrock/test/dispute/lib/LibGameId.t.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import "src/dispute/lib/Types.sol";
 
 contract LibGameId_Test is Test {

packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/OptimismSuperchainERC20.t.sol

@@ -2,15 +2,11 @@
 pragma solidity 0.8.25;
 
 // Testing utilities
-import { Test, StdUtils, Vm } from "forge-std/Test.sol";
-import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { StdAssertions } from "forge-std/StdAssertions.sol";
-import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
+import { Test } from "forge-std/Test.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
 import { ProtocolGuided } from "./fuzz/Protocol.guided.t.sol";
 import { ProtocolUnguided } from "./fuzz/Protocol.unguided.t.sol";
 import { HandlerGetters } from "./helpers/HandlerGetters.t.sol";

packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { DeploymentSummary } from "./utils/DeploymentSummary.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { Types } from "src/libraries/Types.sol";
 import { IL1ERC721Bridge as L1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ICrossDomainMessenger as CrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";

packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { DeploymentSummary } from "./utils/DeploymentSummary.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { Types } from "src/libraries/Types.sol";
 import { IL1StandardBridge as L1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ICrossDomainMessenger as CrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";

packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol

@@ -9,7 +9,6 @@ import { Optimist } from "src/periphery/op-nft/Optimist.sol";
 import { OptimistAllowlist } from "src/periphery/op-nft/OptimistAllowlist.sol";
 import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
 import { OptimistInviterHelper } from "test/mocks/OptimistInviterHelper.sol";
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 library Multicall {

packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol

@@ -6,7 +6,6 @@ import { Test } from "forge-std/Test.sol";
 import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
 import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
 import { Optimist } from "src/periphery/op-nft/Optimist.sol";
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { TestERC1271Wallet } from "test/mocks/TestERC1271Wallet.sol";
 import { OptimistInviterHelper } from "test/mocks/OptimistInviterHelper.sol";
 import { OptimistConstants } from "src/periphery/op-nft/libraries/OptimistConstants.sol";

packages/contracts-bedrock/test/safe/DeployOwnership.t.sol

@@ -13,7 +13,6 @@ import { Test } from "forge-std/Test.sol";
 
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
-import { GuardManager } from "safe-contracts/base/GuardManager.sol";
 
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 import { LivenessModule } from "src/safe/LivenessModule.sol";

packages/contracts-bedrock/test/safe/LivenessModule.t.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
-import { Enum } from "safe-contracts/common/Enum.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 import { LivenessModule } from "src/safe/LivenessModule.sol";

packages/contracts-bedrock/test/setup/Setup.sol

@@ -6,12 +6,10 @@ import { console2 as console } from "forge-std/console2.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 // Scripts
-import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
 import { Deploy } from "scripts/deploy/Deploy.s.sol";
 import { Fork, LATEST_FORK } from "scripts/libraries/Config.sol";
 import { L2Genesis, L1Dependencies } from "scripts/L2Genesis.s.sol";
 import { OutputMode, Fork, ForkUtils } from "scripts/libraries/Config.sol";
-import { Executables } from "scripts/libraries/Executables.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";

packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
-import { CallerCaller, Reverter } from "test/mocks/Callers.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";

packages/contracts-bedrock/test/universal/Specs.t.sol

@@ -6,7 +6,6 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 import { console2 as console } from "forge-std/console2.sol";
 
 // Scripts
-import { Executables } from "scripts/libraries/Executables.sol";
 import { ForgeArtifacts, Abi, AbiEntry } from "scripts/libraries/ForgeArtifacts.sol";
 
 // Contracts

packages/contracts-bedrock/test/vendor/Initializable.t.sol

@@ -12,7 +12,6 @@ import { Process } from "scripts/libraries/Process.sol";
 // Libraries
 import { LibString } from "@solady/utils/LibString.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import { GameTypes } from "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Types.sol";
 import "scripts/deploy/Deployer.sol";