Upgrade to Solidity 0.8.26

ethereum-attestation-service · May 21, 2024 · fea24a5 · fea24a5
1 parent a6db5ab
commit fea24a5
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 35 deletions.
diff --git a/contracts/EAS.sol b/contracts/EAS.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 
@@ -12,7 +12,6 @@ import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
 import {
     AccessDenied,
     EMPTY_UID,
-    Signature,
     InvalidLength,
     NotFound,
     NO_EXPIRATION_TIME,

diff --git a/contracts/Indexer.sol b/contracts/Indexer.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
-import { IEAS, AttestationRequest, AttestationRequestData, Attestation } from "./IEAS.sol";
+import { IEAS, Attestation } from "./IEAS.sol";
 import { EMPTY_UID, uncheckedInc } from "./Common.sol";
 import { Semver } from "./Semver.sol";
 

diff --git a/contracts/SchemaRegistry.sol b/contracts/SchemaRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
 

diff --git a/contracts/eip1271/EIP1271Verifier.sol b/contracts/eip1271/EIP1271Verifier.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";

diff --git a/contracts/eip712/proxy/EIP712Proxy.sol b/contracts/eip712/proxy/EIP712Proxy.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
@@ -22,12 +22,8 @@ import {
 import {
     AttestationRequest,
     AttestationRequestData,
-    DelegatedAttestationRequest,
-    DelegatedRevocationRequest,
     IEAS,
     MultiAttestationRequest,
-    MultiDelegatedAttestationRequest,
-    MultiDelegatedRevocationRequest,
     MultiRevocationRequest,
     RevocationRequest,
     RevocationRequestData

diff --git a/contracts/eip712/proxy/examples/PermissionedEIP712Proxy.sol b/contracts/eip712/proxy/examples/PermissionedEIP712Proxy.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
@@ -23,7 +23,7 @@ contract PermissionedEIP712Proxy is EIP712Proxy, Ownable {
     /// @dev Creates a new PermissionedEIP712Proxy instance.
     /// @param eas The address of the global EAS contract.
     /// @param name The user readable name of the signing domain.
-    constructor(IEAS eas, string memory name) EIP712Proxy(eas, name) {}
+    constructor(IEAS eas, string memory name) Ownable(msg.sender) EIP712Proxy(eas, name) {}
 
     /// @inheritdoc EIP712Proxy
     function attestByDelegation(

diff --git a/contracts/resolver/examples/AttestationResolver.sol b/contracts/resolver/examples/AttestationResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/AttesterResolver.sol b/contracts/resolver/examples/AttesterResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/DataResolver.sol b/contracts/resolver/examples/DataResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/ExpirationTimeResolver.sol b/contracts/resolver/examples/ExpirationTimeResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/PayingResolver.sol b/contracts/resolver/examples/PayingResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 

diff --git a/contracts/resolver/examples/RecipientResolver.sol b/contracts/resolver/examples/RecipientResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/RevocationResolver.sol b/contracts/resolver/examples/RevocationResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/resolver/examples/TokenResolver.sol b/contracts/resolver/examples/TokenResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/resolver/examples/ValueResolver.sol b/contracts/resolver/examples/ValueResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../SchemaResolver.sol";
 

diff --git a/contracts/tests/TestEAS.sol b/contracts/tests/TestEAS.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { EAS } from "../EAS.sol";
 

diff --git a/contracts/tests/TestERC20Token.sol b/contracts/tests/TestERC20Token.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/tests/TestSchemaResolver.sol b/contracts/tests/TestSchemaResolver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { SchemaResolver } from "../resolver/SchemaResolver.sol";
 

diff --git a/contracts/tests/eip1271/TestEIP1271Signer.sol b/contracts/tests/eip1271/TestEIP1271Signer.sol
@@ -1,13 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { IERC1271 } from "@openzeppelin/contracts/interfaces/IERC1271.sol";
 
-import { EIP1271Verifier } from "../../eip1271/EIP1271Verifier.sol";
-
-import { Signature, InvalidSignature } from "../../Common.sol";
-
 contract TestEIP1271Signer is IERC1271 {
     bytes4 private constant EIP1271_INVALID_MAGIC_VALUE = 0xffffffff;
 

diff --git a/contracts/tests/eip1271/TestEIP1271Verifier.sol b/contracts/tests/eip1271/TestEIP1271Verifier.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { EIP1271Verifier } from "../../eip1271/EIP1271Verifier.sol";
 import { DelegatedAttestationRequest, DelegatedRevocationRequest } from "../../IEAS.sol";

diff --git a/contracts/tests/eip712/proxy/TestEIP712Proxy.sol b/contracts/tests/eip712/proxy/TestEIP712Proxy.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.26;
 
 import { IEAS } from "../../../IEAS.sol";
 import { EIP712Proxy, DelegatedProxyAttestationRequest, DelegatedProxyRevocationRequest } from "../../../eip712/proxy/EIP712Proxy.sol";

diff --git a/foundry.toml b/foundry.toml
@@ -1,5 +1,5 @@
 [profile.default]
-solc = "0.8.19"
+solc = "0.8.26"
 bytecode_hash = "none"
 optimizer = true
 optimizer_runs = 1000000

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -285,7 +285,7 @@ const config: HardhatUserConfig = {
   },
 
   solidity: {
-    version: '0.8.19',
+    version: '0.8.26',
     settings: {
       optimizer: {
         enabled: true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ethereum-attestation-service/eas-contracts",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Ethereum Attestation Service",
   "repository": {
     "type": "git",