From f54ca09da7f4d29a2f8efaef0461c91faa2d7dad Mon Sep 17 00:00:00 2001 From: lbeder Date: Fri, 6 Sep 2024 17:01:53 -0400 Subject: [PATCH] Upgrade to Solidity 0.8.27 --- contracts/EAS.sol | 2 +- contracts/Indexer.sol | 2 +- contracts/SchemaRegistry.sol | 2 +- contracts/eip1271/EIP1271Verifier.sol | 2 +- contracts/eip712/proxy/EIP712Proxy.sol | 2 +- .../examples/PermissionedEIP712Proxy.sol | 2 +- .../resolver/examples/AttestationResolver.sol | 2 +- .../resolver/examples/AttesterResolver.sol | 2 +- contracts/resolver/examples/DataResolver.sol | 2 +- .../examples/ExpirationTimeResolver.sol | 2 +- .../resolver/examples/PayingResolver.sol | 2 +- .../resolver/examples/RecipientResolver.sol | 2 +- .../resolver/examples/RevocationResolver.sol | 2 +- contracts/resolver/examples/TokenResolver.sol | 2 +- contracts/resolver/examples/ValueResolver.sol | 2 +- contracts/tests/TestEAS.sol | 2 +- contracts/tests/TestERC20Token.sol | 2 +- contracts/tests/TestSchemaResolver.sol | 2 +- contracts/tests/eip1271/TestEIP1271Signer.sol | 2 +- .../tests/eip1271/TestEIP1271Verifier.sol | 2 +- .../tests/eip712/proxy/TestEIP712Proxy.sol | 2 +- foundry.toml | 2 +- hardhat.config.ts | 2 +- package.json | 2 +- pnpm-lock.yaml | 21 +++++++++++++++++-- 25 files changed, 43 insertions(+), 26 deletions(-) diff --git a/contracts/EAS.sol b/contracts/EAS.sol index df17792..4449a0f 100644 --- a/contracts/EAS.sol +++ b/contracts/EAS.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { Address } from "@openzeppelin/contracts/utils/Address.sol"; diff --git a/contracts/Indexer.sol b/contracts/Indexer.sol index 808ed9f..5f31c11 100644 --- a/contracts/Indexer.sol +++ b/contracts/Indexer.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { IEAS, Attestation } from "./IEAS.sol"; import { EMPTY_UID, uncheckedInc } from "./Common.sol"; diff --git a/contracts/SchemaRegistry.sol b/contracts/SchemaRegistry.sol index 4995bd1..b3f489a 100644 --- a/contracts/SchemaRegistry.sol +++ b/contracts/SchemaRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { ISchemaResolver } from "./resolver/ISchemaResolver.sol"; diff --git a/contracts/eip1271/EIP1271Verifier.sol b/contracts/eip1271/EIP1271Verifier.sol index 95f2319..ebec3c6 100644 --- a/contracts/eip1271/EIP1271Verifier.sol +++ b/contracts/eip1271/EIP1271Verifier.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { Address } from "@openzeppelin/contracts/utils/Address.sol"; import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; diff --git a/contracts/eip712/proxy/EIP712Proxy.sol b/contracts/eip712/proxy/EIP712Proxy.sol index 07f73b3..ff8d333 100644 --- a/contracts/eip712/proxy/EIP712Proxy.sol +++ b/contracts/eip712/proxy/EIP712Proxy.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; diff --git a/contracts/eip712/proxy/examples/PermissionedEIP712Proxy.sol b/contracts/eip712/proxy/examples/PermissionedEIP712Proxy.sol index 160adb1..f0eb70b 100644 --- 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.26; +pragma solidity 0.8.27; import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; diff --git a/contracts/resolver/examples/AttestationResolver.sol b/contracts/resolver/examples/AttestationResolver.sol index f678883..f8c7cc6 100644 --- a/contracts/resolver/examples/AttestationResolver.sol +++ b/contracts/resolver/examples/AttestationResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/AttesterResolver.sol b/contracts/resolver/examples/AttesterResolver.sol index 7d2fc35..82a7ee1 100644 --- a/contracts/resolver/examples/AttesterResolver.sol +++ b/contracts/resolver/examples/AttesterResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/DataResolver.sol b/contracts/resolver/examples/DataResolver.sol index 0dee7fd..e1b264d 100644 --- a/contracts/resolver/examples/DataResolver.sol +++ b/contracts/resolver/examples/DataResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/ExpirationTimeResolver.sol b/contracts/resolver/examples/ExpirationTimeResolver.sol index 8c7b004..aa6b305 100644 --- a/contracts/resolver/examples/ExpirationTimeResolver.sol +++ b/contracts/resolver/examples/ExpirationTimeResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/PayingResolver.sol b/contracts/resolver/examples/PayingResolver.sol index 88437a2..60d6482 100644 --- a/contracts/resolver/examples/PayingResolver.sol +++ b/contracts/resolver/examples/PayingResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { Address } from "@openzeppelin/contracts/utils/Address.sol"; diff --git a/contracts/resolver/examples/RecipientResolver.sol b/contracts/resolver/examples/RecipientResolver.sol index 7464160..f30fca2 100644 --- a/contracts/resolver/examples/RecipientResolver.sol +++ b/contracts/resolver/examples/RecipientResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/RevocationResolver.sol b/contracts/resolver/examples/RevocationResolver.sol index 0aec727..82a12f7 100644 --- a/contracts/resolver/examples/RevocationResolver.sol +++ b/contracts/resolver/examples/RevocationResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/resolver/examples/TokenResolver.sol b/contracts/resolver/examples/TokenResolver.sol index ebef507..5b0a210 100644 --- a/contracts/resolver/examples/TokenResolver.sol +++ b/contracts/resolver/examples/TokenResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; 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 index 34422d4..25ca1f3 100644 --- a/contracts/resolver/examples/ValueResolver.sol +++ b/contracts/resolver/examples/ValueResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { SchemaResolver } from "../SchemaResolver.sol"; diff --git a/contracts/tests/TestEAS.sol b/contracts/tests/TestEAS.sol index e982ada..bc409e2 100644 --- a/contracts/tests/TestEAS.sol +++ b/contracts/tests/TestEAS.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { EAS } from "../EAS.sol"; diff --git a/contracts/tests/TestERC20Token.sol b/contracts/tests/TestERC20Token.sol index 2aabec3..6220829 100644 --- a/contracts/tests/TestERC20Token.sol +++ b/contracts/tests/TestERC20Token.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/tests/TestSchemaResolver.sol b/contracts/tests/TestSchemaResolver.sol index 31670d6..eccd79b 100644 --- a/contracts/tests/TestSchemaResolver.sol +++ b/contracts/tests/TestSchemaResolver.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { IEAS, Attestation } from "./../IEAS.sol"; import { SchemaResolver } from "./../resolver/SchemaResolver.sol"; diff --git a/contracts/tests/eip1271/TestEIP1271Signer.sol b/contracts/tests/eip1271/TestEIP1271Signer.sol index 281043c..85e110f 100644 --- a/contracts/tests/eip1271/TestEIP1271Signer.sol +++ b/contracts/tests/eip1271/TestEIP1271Signer.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; import { IERC1271 } from "@openzeppelin/contracts/interfaces/IERC1271.sol"; diff --git a/contracts/tests/eip1271/TestEIP1271Verifier.sol b/contracts/tests/eip1271/TestEIP1271Verifier.sol index e7fa490..648b8fe 100644 --- a/contracts/tests/eip1271/TestEIP1271Verifier.sol +++ b/contracts/tests/eip1271/TestEIP1271Verifier.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.26; +pragma solidity 0.8.27; 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 index 3be8cf3..c8dfc3a 100644 --- 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.26; +pragma solidity 0.8.27; import { IEAS } from "../../../IEAS.sol"; import { EIP712Proxy, DelegatedProxyAttestationRequest, DelegatedProxyRevocationRequest } from "../../../eip712/proxy/EIP712Proxy.sol"; diff --git a/foundry.toml b/foundry.toml index 9baf7c9..0a5e8dc 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,5 +1,5 @@ [profile.default] -solc = "0.8.26" +solc = "0.8.27" bytecode_hash = "none" optimizer = true optimizer_runs = 1000000 diff --git a/hardhat.config.ts b/hardhat.config.ts index 71ee86f..8916e45 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -285,7 +285,7 @@ const config: HardhatUserConfig = { }, solidity: { - version: '0.8.26', + version: '0.8.27', settings: { optimizer: { enabled: true, diff --git a/package.json b/package.json index daf33ce..97110fe 100755 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "prettier": "^3.3.3", "prettier-package-json": "^2.8.0", "prettier-plugin-solidity": "^1.3.1", - "solc": "0.8.26", + "solc": "0.8.27", "solhint": "^5.0.3", "ts-node": "^10.9.2", "typescript": "^5.5.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c2e0ddb..4ac6e76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -112,8 +112,8 @@ importers: specifier: ^1.3.1 version: 1.3.1(prettier@3.3.3) solc: - specifier: 0.8.26 - version: 0.8.26(debug@4.3.6) + specifier: 0.8.27 + version: 0.8.27 solhint: specifier: ^5.0.3 version: 5.0.3(typescript@5.5.4) @@ -2997,6 +2997,11 @@ packages: engines: {node: '>=10.0.0'} hasBin: true + solc@0.8.27: + resolution: {integrity: sha512-BNxMol2tUAbkH7HKlXBcBqrGi2aqgv+uMHz26mJyTtlVgWmBA4ktiw0qVKHfkjf2oaHbwtbtaSeE2dhn/gTAKw==} + engines: {node: '>=10.0.0'} + hasBin: true + solhint@5.0.3: resolution: {integrity: sha512-OLCH6qm/mZTCpplTXzXTJGId1zrtNuDYP5c2e6snIv/hdRVxPfBBz/bAlL91bY/Accavkayp2Zp2BaDSrLVXTQ==} hasBin: true @@ -7107,6 +7112,18 @@ snapshots: transitivePeerDependencies: - debug + solc@0.8.27: + dependencies: + command-exists: 1.2.9 + commander: 8.3.0 + follow-redirects: 1.15.6(debug@4.3.6) + js-sha3: 0.8.0 + memorystream: 0.3.1 + semver: 5.7.2 + tmp: 0.0.33 + transitivePeerDependencies: + - debug + solhint@5.0.3(typescript@5.5.4): dependencies: '@solidity-parser/parser': 0.18.0