make the unused imports script check support multiline formatted imports,...

make the unused imports script check support multiline formatted imports, remove unused imports (#13695)

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

@@ -16,7 +16,7 @@ var asPattern = regexp.MustCompile(`(\S+)\s+as\s+(\S+)`)
 func main() {
 	if _, err := common.ProcessFilesGlob(
 		[]string{"src/**/*.sol", "scripts/**/*.sol", "test/**/*.sol", "interfaces/**/*.sol"},
-		[]string{},
+		[]string{"src/dispute/lib/Types.sol"},
 		processFile,
 	); err != nil {
 		fmt.Printf("error: %v\n", err)
@@ -74,12 +74,22 @@ func isImportUsed(imp, content string) bool {
 	wordPattern := fmt.Sprintf(`\b%s\b`, regexp.QuoteMeta(imp))
 	scanner := bufio.NewScanner(strings.NewReader(content))
 
+	importOpen := false
 	for scanner.Scan() {
 		line := scanner.Text()
 		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") {
+		if importOpen {
+			if strings.Contains(line, "}") {
+				importOpen = false
+			}
+			continue
+		}
+		if strings.Contains(line, "import {") {
+			if !strings.Contains(line, "}") {
+				importOpen = true
+			}
 			continue
 		}
 

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

@@ -148,8 +148,8 @@
     "sourceCodeHash": "0xdb771f1b92c7612b120e0bce31967f0c8a7ce332dbb426bc9cfc52b47be21c4d"
   },
   "src/cannon/PreimageOracle.sol": {
-    "initCodeHash": "0xf08736a5af9277a4f3498dfee84a40c9b05f1a2ba3177459bebe2b0b54f99343",
-    "sourceCodeHash": "0x14b952b2a00bc4ec5e149bb5fb2a973bb255f0fd3f4a42b6bd05bc3bbe51f2b1"
+    "initCodeHash": "0x17d3b3df1aaaf7a705b8d48de8a05e6511b910fdafdbe5eb7f7f95ec944fba9a",
+    "sourceCodeHash": "0xb7b0a06cd971c4647247dc19ce997d0c64a73e87c81d30731da9cf9efa1b952a"
   },
   "src/dispute/AnchorStateRegistry.sol": {
     "initCodeHash": "0x2d831d6afc62df024eb2df22eaca3c7378171e63d87c608bb53c0020d30c3dee",
@@ -212,8 +212,8 @@
     "sourceCodeHash": "0x02025b303a8f37b4e541f8c7936a8651402a60ea0147a53176e06b51b15a1f84"
   },
   "src/vendor/eas/EAS.sol": {
-    "initCodeHash": "0xce1700cfc0a8e346b0a8e8c64b6570ba731d874b434b4798fe3176f3903c404b",
-    "sourceCodeHash": "0xde4c41139672fc0581ba77425ab1d822a8123ceaa3ad0655be869fcc722b8add"
+    "initCodeHash": "0xbd79d6fff128b3da3e09ead84b805b7540740190488f2791a6b4e5b7aabf9cff",
+    "sourceCodeHash": "0x3512c3a1b5871341346f6646a04c0895dd563e9824f2ab7ab965b6a81a41ad2e"
   },
   "src/vendor/eas/SchemaRegistry.sol": {
     "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",

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

@@ -6,7 +6,6 @@ import { LibKeccak } from "@lib-keccak/LibKeccak.sol";
 import { PreimageKeyLib } from "src/cannon/PreimageKeyLib.sol";
 import {
     PartOffsetOOB,
-    NotEnoughGas,
     InvalidProof,
     InvalidPreimage,
     InvalidInputSize,
@@ -51,8 +50,8 @@ contract PreimageOracle is ISemver {
     uint256 public constant PRECOMPILE_CALL_RESERVED_GAS = 100_000;
 
     /// @notice The semantic version of the Preimage Oracle contract.
-    /// @custom:semver 1.1.3-beta.8
-    string public constant version = "1.1.3-beta.8";
+    /// @custom:semver 1.1.3-beta.9
+    string public constant version = "1.1.3-beta.9";
 
     ////////////////////////////////////////////////////////////////
     //                 Authorized Preimage Parts                  //

packages/contracts-bedrock/src/vendor/eas/EAS.sol

@@ -10,7 +10,6 @@ import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
 import {
     AccessDenied,
     EMPTY_UID,
-    Signature,
     InvalidLength,
     MAX_GAP,
     NotFound,
@@ -80,8 +79,8 @@ contract EAS is IEAS, ISemver, EIP1271Verifier {
     uint256[MAX_GAP - 3] private __gap;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.1-beta.2
-    string public constant version = "1.4.1-beta.2";
+    /// @custom:semver 1.4.1-beta.3
+    string public constant version = "1.4.1-beta.3";
 
     /// @dev Creates a new EAS instance.
     constructor() EIP1271Verifier("EAS", "1.3.0") { }

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

@@ -6,7 +6,6 @@ import {
     SafeConfig,
     SecurityCouncilConfig,
     GuardianConfig,
-    DeputyGuardianModuleConfig,
     LivenessModuleConfig
 } from "scripts/deploy/DeployOwnership.s.sol";
 import { Test } from "forge-std/Test.sol";