From 58ff80f859909e1b6a417cec5c1d8e3a838b3207 Mon Sep 17 00:00:00 2001 From: Simon Brown Date: Thu, 7 Dec 2023 12:05:47 +0000 Subject: [PATCH] Upgraded compiler version to 0.8.21 --- .solhint.json | 2 +- contracts/CaveatEnforcer.sol | 2 +- contracts/Delegatable.sol | 2 +- contracts/DelegatableCore.sol | 2 +- contracts/DelegatableFacet.sol | 2 +- contracts/DelegatableRelay.sol | 2 +- contracts/DelegatableRelayCore.sol | 2 +- contracts/TypesAndDecoders.sol | 2 +- contracts/enforcers/AllowedMethodsEnforcer.sol | 2 +- contracts/enforcers/BlockNumberAfterEnforcer.sol | 2 +- contracts/enforcers/BlockNumberBeforeEnforcer.sol | 2 +- contracts/enforcers/BlockNumberEnforcer.sol | 2 +- contracts/enforcers/EIP1271Enforcer.sol | 2 +- contracts/enforcers/ERC20AllowanceEnforcer.sol | 2 +- contracts/enforcers/LimitedCallsEnforcer.sol | 2 +- contracts/enforcers/RevocationEnforcer.sol | 2 +- contracts/enforcers/TimestampAfterEnforcer.sol | 2 +- contracts/enforcers/TimestampBeforeEnforcer.sol | 2 +- contracts/enforcers/TimestampEnforcer.sol | 2 +- contracts/extensions/ERC20Delegatable.sol | 2 +- contracts/interfaces/ICaveatEnforcer.sol | 2 +- contracts/interfaces/IDelegatable.sol | 2 +- contracts/interfaces/IERC1271Wallet.sol | 2 +- contracts/libraries/ECRecovery.sol | 2 +- contracts/mock/MockDelegatable.sol | 2 +- contracts/mock/MockDelegatableCore.sol | 2 +- contracts/mock/MockPurposeFacet.sol | 2 +- contracts/mock/MockRelayedDelegatable.sol | 2 +- contracts/test/DelegatableOwnable.sol | 2 +- contracts/test/EIP1271.sol | 2 +- hardhat.config.ts | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 33 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.solhint.json b/.solhint.json index bd7b120..188fd04 100644 --- a/.solhint.json +++ b/.solhint.json @@ -5,7 +5,7 @@ "func-order": "off", "mark-callable-contracts": "off", "no-empty-blocks": "off", - "compiler-version": ["error", "0.8.15"], + "compiler-version": ["error", "0.8.21"], "private-vars-leading-underscore": "off", "code-complexity": "warn", "const-name-snakecase": "warn", diff --git a/contracts/CaveatEnforcer.sol b/contracts/CaveatEnforcer.sol index 954855a..8a3592a 100644 --- a/contracts/CaveatEnforcer.sol +++ b/contracts/CaveatEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "./TypesAndDecoders.sol"; diff --git a/contracts/Delegatable.sol b/contracts/Delegatable.sol index 869079b..cb05757 100644 --- a/contracts/Delegatable.sol +++ b/contracts/Delegatable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; // import "hardhat/console.sol"; import {EIP712DOMAIN_TYPEHASH} from "./TypesAndDecoders.sol"; diff --git a/contracts/DelegatableCore.sol b/contracts/DelegatableCore.sol index 574a294..0930b15 100644 --- a/contracts/DelegatableCore.sol +++ b/contracts/DelegatableCore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import {EIP712Decoder, EIP712DOMAIN_TYPEHASH} from "./TypesAndDecoders.sol"; import {Delegation, Invocation, Invocations, SignedInvocation, SignedDelegation, Transaction, ReplayProtection, CaveatEnforcer} from "./CaveatEnforcer.sol"; diff --git a/contracts/DelegatableFacet.sol b/contracts/DelegatableFacet.sol index c813805..1b3729d 100644 --- a/contracts/DelegatableFacet.sol +++ b/contracts/DelegatableFacet.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; // import "hardhat/console.sol"; import {EIP712DOMAIN_TYPEHASH} from "./TypesAndDecoders.sol"; diff --git a/contracts/DelegatableRelay.sol b/contracts/DelegatableRelay.sol index e1faa61..cfbffa9 100644 --- a/contracts/DelegatableRelay.sol +++ b/contracts/DelegatableRelay.sol @@ -1,5 +1,5 @@ // SPDe-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; // import "hardhat/console.sol"; import {EIP712DOMAIN_TYPEHASH} from "./TypesAndDecoders.sol"; diff --git a/contracts/DelegatableRelayCore.sol b/contracts/DelegatableRelayCore.sol index 890b504..4f444d7 100644 --- a/contracts/DelegatableRelayCore.sol +++ b/contracts/DelegatableRelayCore.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import {EIP712Decoder, EIP712DOMAIN_TYPEHASH} from "./TypesAndDecoders.sol"; import {Delegation, Invocation, Invocations, SignedInvocation, SignedDelegation, Transaction, ReplayProtection, CaveatEnforcer} from "./CaveatEnforcer.sol"; diff --git a/contracts/TypesAndDecoders.sol b/contracts/TypesAndDecoders.sol index 28dd8a4..a968be6 100644 --- a/contracts/TypesAndDecoders.sol +++ b/contracts/TypesAndDecoders.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "./libraries/ECRecovery.sol"; // BEGIN EIP712 AUTOGENERATED SETUP diff --git a/contracts/enforcers/AllowedMethodsEnforcer.sol b/contracts/enforcers/AllowedMethodsEnforcer.sol index 63d57a2..2915cfe 100644 --- a/contracts/enforcers/AllowedMethodsEnforcer.sol +++ b/contracts/enforcers/AllowedMethodsEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; diff --git a/contracts/enforcers/BlockNumberAfterEnforcer.sol b/contracts/enforcers/BlockNumberAfterEnforcer.sol index 26294c4..a51af49 100644 --- a/contracts/enforcers/BlockNumberAfterEnforcer.sol +++ b/contracts/enforcers/BlockNumberAfterEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/enforcers/BlockNumberBeforeEnforcer.sol b/contracts/enforcers/BlockNumberBeforeEnforcer.sol index d26155f..5c313ec 100644 --- a/contracts/enforcers/BlockNumberBeforeEnforcer.sol +++ b/contracts/enforcers/BlockNumberBeforeEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/enforcers/BlockNumberEnforcer.sol b/contracts/enforcers/BlockNumberEnforcer.sol index 270f30b..1dc2bbe 100644 --- a/contracts/enforcers/BlockNumberEnforcer.sol +++ b/contracts/enforcers/BlockNumberEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/enforcers/EIP1271Enforcer.sol b/contracts/enforcers/EIP1271Enforcer.sol index 5de6af7..0d99607 100644 --- a/contracts/enforcers/EIP1271Enforcer.sol +++ b/contracts/enforcers/EIP1271Enforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {IERC1271Wallet} from "../interfaces/IERC1271Wallet.sol"; diff --git a/contracts/enforcers/ERC20AllowanceEnforcer.sol b/contracts/enforcers/ERC20AllowanceEnforcer.sol index 1e696ba..b5a17ea 100644 --- a/contracts/enforcers/ERC20AllowanceEnforcer.sol +++ b/contracts/enforcers/ERC20AllowanceEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../CaveatEnforcer.sol"; diff --git a/contracts/enforcers/LimitedCallsEnforcer.sol b/contracts/enforcers/LimitedCallsEnforcer.sol index 4704e77..c8ea9e9 100644 --- a/contracts/enforcers/LimitedCallsEnforcer.sol +++ b/contracts/enforcers/LimitedCallsEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import {BytesLib} from "../libraries/BytesLib.sol"; import "../CaveatEnforcer.sol"; diff --git a/contracts/enforcers/RevocationEnforcer.sol b/contracts/enforcers/RevocationEnforcer.sol index ca71e8b..cb9bafb 100644 --- a/contracts/enforcers/RevocationEnforcer.sol +++ b/contracts/enforcers/RevocationEnforcer.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.8.15; +pragma solidity ^0.8.21; //SPDX-License-Identifier: MIT import "../CaveatEnforcer.sol"; diff --git a/contracts/enforcers/TimestampAfterEnforcer.sol b/contracts/enforcers/TimestampAfterEnforcer.sol index cc5e536..7e3c3e0 100644 --- a/contracts/enforcers/TimestampAfterEnforcer.sol +++ b/contracts/enforcers/TimestampAfterEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/enforcers/TimestampBeforeEnforcer.sol b/contracts/enforcers/TimestampBeforeEnforcer.sol index 881feeb..8deb2f0 100644 --- a/contracts/enforcers/TimestampBeforeEnforcer.sol +++ b/contracts/enforcers/TimestampBeforeEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/enforcers/TimestampEnforcer.sol b/contracts/enforcers/TimestampEnforcer.sol index 463341f..4aec1e4 100644 --- a/contracts/enforcers/TimestampEnforcer.sol +++ b/contracts/enforcers/TimestampEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; import {BytesLib} from "../libraries/BytesLib.sol"; diff --git a/contracts/extensions/ERC20Delegatable.sol b/contracts/extensions/ERC20Delegatable.sol index a3ccc67..8c36ea3 100644 --- a/contracts/extensions/ERC20Delegatable.sol +++ b/contracts/extensions/ERC20Delegatable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "../Delegatable.sol"; diff --git a/contracts/interfaces/ICaveatEnforcer.sol b/contracts/interfaces/ICaveatEnforcer.sol index f268b8d..cfa46dc 100644 --- a/contracts/interfaces/ICaveatEnforcer.sol +++ b/contracts/interfaces/ICaveatEnforcer.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../TypesAndDecoders.sol"; diff --git a/contracts/interfaces/IDelegatable.sol b/contracts/interfaces/IDelegatable.sol index 9575179..56ead8e 100644 --- a/contracts/interfaces/IDelegatable.sol +++ b/contracts/interfaces/IDelegatable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../TypesAndDecoders.sol"; diff --git a/contracts/interfaces/IERC1271Wallet.sol b/contracts/interfaces/IERC1271Wallet.sol index b8fbefb..45ccac9 100644 --- a/contracts/interfaces/IERC1271Wallet.sol +++ b/contracts/interfaces/IERC1271Wallet.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../CaveatEnforcer.sol"; diff --git a/contracts/libraries/ECRecovery.sol b/contracts/libraries/ECRecovery.sol index 29c07e6..09fa708 100644 --- a/contracts/libraries/ECRecovery.sol +++ b/contracts/libraries/ECRecovery.sol @@ -1,4 +1,4 @@ -pragma solidity 0.8.15; +pragma solidity 0.8.21; // SPDX-License-Identifier: MIT diff --git a/contracts/mock/MockDelegatable.sol b/contracts/mock/MockDelegatable.sol index 7537c30..36f9cff 100644 --- a/contracts/mock/MockDelegatable.sol +++ b/contracts/mock/MockDelegatable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "@openzeppelin/contracts/access/Ownable.sol"; import "../Delegatable.sol"; diff --git a/contracts/mock/MockDelegatableCore.sol b/contracts/mock/MockDelegatableCore.sol index 4fbd722..9217618 100644 --- a/contracts/mock/MockDelegatableCore.sol +++ b/contracts/mock/MockDelegatableCore.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "hardhat/console.sol"; import "../DelegatableCore.sol"; diff --git a/contracts/mock/MockPurposeFacet.sol b/contracts/mock/MockPurposeFacet.sol index 19219a3..754498f 100644 --- a/contracts/mock/MockPurposeFacet.sol +++ b/contracts/mock/MockPurposeFacet.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "../Delegatable.sol"; import "../diamond/libraries/LibDiamond.sol"; diff --git a/contracts/mock/MockRelayedDelegatable.sol b/contracts/mock/MockRelayedDelegatable.sol index 4876432..1dc29ce 100644 --- a/contracts/mock/MockRelayedDelegatable.sol +++ b/contracts/mock/MockRelayedDelegatable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "@openzeppelin/contracts/access/Ownable.sol"; import "../Delegatable.sol"; diff --git a/contracts/test/DelegatableOwnable.sol b/contracts/test/DelegatableOwnable.sol index 760c7fd..9db7b10 100644 --- a/contracts/test/DelegatableOwnable.sol +++ b/contracts/test/DelegatableOwnable.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.15; +pragma solidity 0.8.21; import "@openzeppelin/contracts/access/Ownable.sol"; import "../Delegatable.sol"; diff --git a/contracts/test/EIP1271.sol b/contracts/test/EIP1271.sol index 68e72ce..9f26b65 100644 --- a/contracts/test/EIP1271.sol +++ b/contracts/test/EIP1271.sol @@ -1,4 +1,4 @@ -pragma solidity 0.8.15; +pragma solidity 0.8.21; //SPDX-License-Identifier: MIT diff --git a/hardhat.config.ts b/hardhat.config.ts index e11fecb..8951248 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -60,7 +60,7 @@ const config: HardhatUserConfig = { }, networks, solidity: { - version: "0.8.15", + version: "0.8.21", settings: { optimizer: { enabled: true, diff --git a/package.json b/package.json index 3a3e3a3..5eacb54 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "node-watch": "0.7.3", "prettier": "^2.6.2", "prettier-plugin-solidity": "1.0.0-beta.24", - "solc": "0.8.15", + "solc": "0.8.21", "solhint": "3.3.7", "solidity-coverage": "0.7.18", "solidity-docgen": "0.5.16", diff --git a/yarn.lock b/yarn.lock index 0cb932c..70cc27d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8818,10 +8818,10 @@ solc@0.7.3: semver "^5.5.0" tmp "0.0.33" -solc@0.8.15: - version "0.8.15" - resolved "https://registry.npmjs.org/solc/-/solc-0.8.15.tgz" - integrity sha512-Riv0GNHNk/SddN/JyEuFKwbcWcEeho15iyupTSHw5Np6WuXA5D8kEHbyzDHi6sqmvLzu2l+8b1YmL8Ytple+8w== +solc@0.8.21: + version "0.8.21" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.21.tgz#c3cd505c360ea2fa0eaa5ab574ef96bffb1a2766" + integrity sha512-N55ogy2dkTRwiONbj4e6wMZqUNaLZkiRcjGyeafjLYzo/tf/IvhHY5P5wpe+H3Fubh9idu071i8eOGO31s1ylg== dependencies: command-exists "^1.2.8" commander "^8.1.0"