find lone words, rm more unused imports, print file path and not file name (#13461)

* find lone words, rm more unused imports, print file path and not file name

* fixes

packages/contracts-bedrock/scripts/checks/common/util.go

@@ -48,13 +48,13 @@ func ProcessFiles[T any](files map[string]string, processor FileProcessor[T]) (m
 	reporter := NewErrorReporter()
 	results := sync.Map{}
 
-	for name, path := range files {
-		name, path := name, path // Capture loop variables
+	for _, path := range files {
+		path := path // Capture loop variables
 		g.Go(func() error {
 			result, errs := processor(path)
 			if len(errs) > 0 {
 				for _, err := range errs {
-					reporter.Fail("%s: %v", name, err)
+					reporter.Fail("%s: %v", path, err)
 				}
 			} else {
 				results.Store(path, result)

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

@@ -70,16 +70,20 @@ func findImports(content string) []string {
 }
 
 func isImportUsed(imp, content string) bool {
+	// Use a regular expression to match the import as a whole word
+	wordPattern := fmt.Sprintf(`\b%s\b`, regexp.QuoteMeta(imp))
 	scanner := bufio.NewScanner(strings.NewReader(content))
+
 	for scanner.Scan() {
 		line := scanner.Text()
-		if strings.HasPrefix(strings.TrimSpace(line), "//") {
+		if strings.HasPrefix(strings.TrimSpace(line), "//") || strings.HasPrefix(strings.TrimSpace(line), "/*") || strings.HasPrefix(strings.TrimSpace(line), "*") || strings.HasPrefix(strings.TrimSpace(line), "*/") {
 			continue
 		}
 		if strings.Contains(line, "import") {
 			continue
 		}
-		if strings.Contains(line, imp) {
+
+		if matched, _ := regexp.MatchString(wordPattern, line); matched {
 			return true
 		}
 	}

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

@@ -11,7 +11,6 @@ import { GuardManager } from "safe-contracts/base/GuardManager.sol";
 import { Enum as SafeOps } from "safe-contracts/common/Enum.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
-import { Deployer } from "scripts/deploy/Deployer.sol";
 
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 import { LivenessModule } from "src/safe/LivenessModule.sol";

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -28,12 +28,12 @@
     "sourceCodeHash": "0xb71e8bc24ea9ebb5692762005f2936ba2a00bf169e1e32f504a0f6e23a349a22"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0xa943efcc061bc59d129649de04ef8ba6318e2ff6eb10383b09ea71e3cbac5e5e",
-    "sourceCodeHash": "0x73df6c482332264954659ef4bcc18b7fb02a64a727018b4ae1aed8d2ec11c959"
+    "initCodeHash": "0xe7c85e9822e0fdadd7a5b7909b8b097e18a72997f70d85ea5122f8f129d89847",
+    "sourceCodeHash": "0x9d138b09731e7c47d32c3671b0757a0a66d0629e397656d9690c38841bbb643a"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x7f8118c0abdcae94ebd08b15709b27bf7abe8fec96c74be109f2126d99f943a1",
-    "sourceCodeHash": "0x813fcf02c02798ebba8ed93f95eca82bdf9080c0edc5f2492c72c19b6c5f36b4"
+    "initCodeHash": "0x339019bc5c09e0defac37c6bba7b356d55e5a421cbd761ab9af84def39556413",
+    "sourceCodeHash": "0xeb7323d25dfcbeac165a27d4bb112c45ca9d04de82b75b2dba22b3b2181514ae"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0xb0ff1661226417342001fe9f0b64c340b7c074ff71579abf05399f4e742aaca1",
@@ -92,8 +92,8 @@
     "sourceCodeHash": "0x411d8cf2f9ef44949962aaed71c6b40eb4bb93768888632fa8330bf249c2301b"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0x46e2d315b8e880f20a5c0ab5579542e6c68461e8f5202a5a5bf8c765fd8b629f",
-    "sourceCodeHash": "0x97fdf7168d578dc489deb6f4098de765d1019f4be6b6aaa176457947f7bc8397"
+    "initCodeHash": "0x6f121b0f0db6856f0cf36b112cc1a342530f15df962110a1a71c0d93cdd09f8a",
+    "sourceCodeHash": "0x616bd1da0b2f9a4efe5841ba4c292f123802d155a2d3ac595ef25542ee475490"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
     "initCodeHash": "0xf9d82084dcef31a3737a76d8ee4e5842ea190d0f77ed4678adb3bbb95217050f",

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

@@ -34,7 +34,7 @@ import {
     ProposalNotValidated,
     AlreadyFinalized
 } from "src/libraries/PortalErrors.sol";
-import { GameStatus, GameType, Claim, Timestamp, Hash } from "src/dispute/lib/Types.sol";
+import { GameStatus, GameType, Claim, Timestamp } from "src/dispute/lib/Types.sol";
 
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -183,9 +183,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 3.11.0-beta.7
+    /// @custom:semver 3.11.0-beta.8
     function version() public pure virtual returns (string memory) {
-        return "3.11.0-beta.7";
+        return "3.11.0-beta.8";
     }
 
     /// @notice Constructs the OptimismPortal contract.

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

@@ -25,9 +25,9 @@ contract OptimismPortalInterop is OptimismPortal2 {
         OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds)
     { }
 
-    /// @custom:semver +interop-beta.4
+    /// @custom:semver +interop-beta.5
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.4");
+        return string.concat(super.version(), "+interop-beta.5");
     }
 
     /// @notice Sets static configuration options for the L2 system.

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

@@ -8,7 +8,6 @@ import { L2StandardBridge } from "src/L2/L2StandardBridge.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
 import { IMintableAndBurnableERC20 } from "interfaces/L2/IMintableAndBurnableERC20.sol";
@@ -40,9 +39,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.5
+    /// @custom:semver +interop-beta.6
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.5");
+        return string.concat(super.version(), "+interop-beta.6");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.15;
 
 // Testing
-import { Test } from "forge-std/Test.sol";
 import { FaultDisputeGame_Init, _changeClaimStatus } from "test/dispute/FaultDisputeGame.t.sol";
 
 // Libraries

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.15;
 
 // Testing
-import { Test } from "forge-std/Test.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries

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

@@ -2,12 +2,8 @@
 pragma solidity ^0.8.15;
 
 // Testing
-import { Test } from "forge-std/Test.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 
-// Contracts
-import { Proxy } from "src/universal/Proxy.sol";
-
 // Libraries
 import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.15;
 
 // Testing
-import { Test } from "forge-std/Test.sol";
 import { DisputeGameFactory_Init } from "test/dispute/DisputeGameFactory.t.sol";
 import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
 

packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 import { StdUtils } from "forge-std/StdUtils.sol";
-import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 import { StdInvariant } from "forge-std/StdInvariant.sol";

packages/contracts-bedrock/test/invariants/Burn.Gas.t.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 import { StdUtils } from "forge-std/StdUtils.sol";
-import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 import { StdInvariant } from "forge-std/StdInvariant.sol";

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

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test } from "forge-std/Test.sol";
-
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { StdInvariant } from "forge-std/StdInvariant.sol";
 

packages/contracts-bedrock/test/libraries/Storage.t.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 // Target contract
-import { Storage } from "src/libraries/Storage.sol";
 import { StorageSetter } from "src/universal/StorageSetter.sol";
 import { Test } from "forge-std/Test.sol";
 

packages/contracts-bedrock/test/opcm/DeployAlphabetVM.t.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import { Test } from "forge-std/Test.sol";
-import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
 import { DeployAlphabetVM, DeployAlphabetVMInput, DeployAlphabetVMOutput } from "scripts/deploy/DeployAlphabetVM.s.sol";
 
 contract DeployAlphabetVMInput_Test is Test {

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

@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { ForgeArtifacts, Abi } from "scripts/libraries/ForgeArtifacts.sol";
-import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 // Contracts

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

@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 // Scripts

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

@@ -2,7 +2,6 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { SafeSigners } from "src/safe/SafeSigners.sol";
 import "test/safe-tools/SafeTestTools.sol";
 

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

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