maint(ct): move EAS contracts into vendor folder (ethereum-optimism#1…

…2277) Contracts being hosted in this repository that are considered "third-party" are to be hosted in the vendor folder.
unattended-backpack · Oct 3, 2024 · 35426c1 · 35426c1
1 parent f538497
commit 35426c1
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/.semgrepignore b/.semgrepignore
@@ -32,7 +32,7 @@ packages/contracts-bedrock/scripts/libraries/Solarray.sol
 
 # Contracts: vendor interfaces
 packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-packages/contracts-bedrock/src/EAS/
+packages/contracts-bedrock/src/vendor/eas/
 
 # Contracts: deliberate exclusions
 packages/contracts-bedrock/src/universal/WETH98.sol

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
@@ -1,12 +1,4 @@
 {
-  "src/EAS/EAS.sol": {
-    "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
-    "sourceCodeHash": "0x1902e1528cc6ff04a181036d9f1da70bd3f861b6cf1bb844d916501af5f40127"
-  },
-  "src/EAS/SchemaRegistry.sol": {
-    "initCodeHash": "0x06ae2c0b39c215b7fa450d382916ce6f5c6f9f2d630e572db6b72d688255b3fd",
-    "sourceCodeHash": "0x9ec99e63a991691e8756a663edf2ccfbe9b91161c134e24f38298da61ecd66dd"
-  },
   "src/L1/DataAvailabilityChallenge.sol": {
     "initCodeHash": "0xbd00d6568abab3e7fc211c40d682862242f25493010a4a097bd1f3b45c8c87c3",
     "sourceCodeHash": "0x58b587034a67b4bb718abbaded8ac23b082c0971105874bcc42c23f051c67f6e"
@@ -226,5 +218,13 @@
   "src/universal/StorageSetter.sol": {
     "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
     "sourceCodeHash": "0xc1ea12a87e3a7ef9c950f0a41a4e35b60d4d9c4c816ff671dbfca663861c16f4"
+  },
+  "src/vendor/eas/EAS.sol": {
+    "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
+    "sourceCodeHash": "0xbeca762929db37f1c7a2067e136c616f563ca18e85871ad7ae2d3ff55a16e6cb"
+  },
+  "src/vendor/eas/SchemaRegistry.sol": {
+    "initCodeHash": "0x06ae2c0b39c215b7fa450d382916ce6f5c6f9f2d630e572db6b72d688255b3fd",
+    "sourceCodeHash": "0xa014d9c992f439dee8221e065828c3326ca2c4f5db0e83431c64c20f7e51ec14"
   }
 }
diff --git a/packages/contracts-bedrock/slither.config.json b/packages/contracts-bedrock/slither.config.json
@@ -5,6 +5,6 @@
   "exclude_low": true,
   "exclude_optimization": true,
   "fail_on": "none",
-  "filter_paths": "(src/vendor|src/cannon/MIPS.sol|src/EAS/EAS.sol)",
+  "filter_paths": "(src/vendor|src/cannon/MIPS.sol|src/vendor/eas/EAS.sol)",
   "foundry_out_directory": "artifacts"
 }
diff --git a/...ages/contracts-bedrock/src/EAS/Common.sol → ...ntracts-bedrock/src/vendor/eas/Common.sol b/...ages/contracts-bedrock/src/EAS/Common.sol → ...ntracts-bedrock/src/vendor/eas/Common.sol
diff --git a/packages/contracts-bedrock/src/EAS/EAS.sol → .../contracts-bedrock/src/vendor/eas/EAS.sol b/packages/contracts-bedrock/src/EAS/EAS.sol → .../contracts-bedrock/src/vendor/eas/EAS.sol
@@ -4,8 +4,8 @@ pragma solidity 0.8.19;
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { EIP1271Verifier } from "src/EAS/eip1271/EIP1271Verifier.sol";
-import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";
+import { EIP1271Verifier } from "src/vendor/eas/eip1271/EIP1271Verifier.sol";
+import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
 
 import {
     AccessDenied,
@@ -16,7 +16,7 @@ import {
     NotFound,
     NO_EXPIRATION_TIME,
     uncheckedInc
-} from "src/EAS/Common.sol";
+} from "src/vendor/eas/Common.sol";
 
 import {
     Attestation,
@@ -31,9 +31,9 @@ import {
     MultiRevocationRequest,
     RevocationRequest,
     RevocationRequestData
-} from "src/EAS/IEAS.sol";
+} from "src/vendor/eas/IEAS.sol";
 
-import { ISchemaRegistry, SchemaRecord } from "src/EAS/ISchemaRegistry.sol";
+import { ISchemaRegistry, SchemaRecord } from "src/vendor/eas/ISchemaRegistry.sol";
 
 struct AttestationsResult {
     uint256 usedValue; // Total ETH amount that was sent to resolvers.

diff --git a/packages/contracts-bedrock/src/EAS/IEAS.sol → ...contracts-bedrock/src/vendor/eas/IEAS.sol b/packages/contracts-bedrock/src/EAS/IEAS.sol → ...contracts-bedrock/src/vendor/eas/IEAS.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISchemaRegistry } from "src/EAS/ISchemaRegistry.sol";
-import { Attestation, Signature } from "src/EAS/Common.sol";
+import { ISchemaRegistry } from "src/vendor/eas/ISchemaRegistry.sol";
+import { Attestation, Signature } from "src/vendor/eas/Common.sol";
 
 /// @dev A struct representing the arguments of the attestation request.
 struct AttestationRequestData {

diff --git a/...racts-bedrock/src/EAS/ISchemaRegistry.sol → ...edrock/src/vendor/eas/ISchemaRegistry.sol b/...racts-bedrock/src/EAS/ISchemaRegistry.sol → ...edrock/src/vendor/eas/ISchemaRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";
+import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
 
 /// @title A struct representing a record for a submitted schema.
 struct SchemaRecord {

diff --git a/...tracts-bedrock/src/EAS/SchemaRegistry.sol → ...bedrock/src/vendor/eas/SchemaRegistry.sol b/...tracts-bedrock/src/EAS/SchemaRegistry.sol → ...bedrock/src/vendor/eas/SchemaRegistry.sol
@@ -2,9 +2,9 @@
 pragma solidity 0.8.19;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";
-import { EMPTY_UID, MAX_GAP } from "src/EAS/Common.sol";
-import { ISchemaRegistry, SchemaRecord } from "src/EAS/ISchemaRegistry.sol";
+import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
+import { EMPTY_UID, MAX_GAP } from "src/vendor/eas/Common.sol";
+import { ISchemaRegistry, SchemaRecord } from "src/vendor/eas/ISchemaRegistry.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000020

diff --git a/...drock/src/EAS/eip1271/EIP1271Verifier.sol → ...rc/vendor/eas/eip1271/EIP1271Verifier.sol b/...drock/src/EAS/eip1271/EIP1271Verifier.sol → ...rc/vendor/eas/eip1271/EIP1271Verifier.sol
@@ -10,7 +10,7 @@ import {
     DelegatedAttestationRequest,
     DelegatedRevocationRequest,
     RevocationRequestData
-} from "src/EAS/IEAS.sol";
+} from "src/vendor/eas/IEAS.sol";
 
 import {
     DeadlineExpired,
@@ -20,7 +20,7 @@ import {
     MAX_GAP,
     stringToBytes32,
     bytes32ToString
-} from "src/EAS/Common.sol";
+} from "src/vendor/eas/Common.sol";
 
 /// @title EIP1271Verifier
 /// @notice EIP1271Verifier typed signatures verifier for EAS delegated attestations.

diff --git a/...rock/src/EAS/resolver/ISchemaResolver.sol → ...c/vendor/eas/resolver/ISchemaResolver.sol b/...rock/src/EAS/resolver/ISchemaResolver.sol → ...c/vendor/eas/resolver/ISchemaResolver.sol
diff --git a/...drock/src/EAS/resolver/SchemaResolver.sol → ...rc/vendor/eas/resolver/SchemaResolver.sol b/...drock/src/EAS/resolver/SchemaResolver.sol → ...rc/vendor/eas/resolver/SchemaResolver.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import { IEAS, Attestation } from "src/EAS/IEAS.sol";
-import { AccessDenied, InvalidEAS, InvalidLength, uncheckedInc } from "src/EAS/Common.sol";
+import { IEAS, Attestation } from "src/vendor/eas/IEAS.sol";
+import { AccessDenied, InvalidEAS, InvalidLength, uncheckedInc } from "src/vendor/eas/Common.sol";
 
-import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";
+import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
 
 /// @title SchemaResolver
 /// @notice The base schema resolver contract.