move to sol 0.8

WasderGG · Mar 23, 2021 · eda79ae · eda79ae
1 parent ca1ef32
commit eda79ae
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -9,12 +9,12 @@
       }
     ],
     "code-complexity": ["error", 7],
-    "compiler-version": ["error", "^0.7.0"],
+    "compiler-version": ["error", "^0.8.0"],
     "const-name-snakecase": "off",
     "func-name-mixedcase": "off",
     "constructor-syntax": "error",
-    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "func-visibility": ["error", {"ignoreConstructors": true}],
     "not-rely-on-time": "off",
-    "reason-string": ["warn", { "maxLength": 64 }]
+    "reason-string": ["warn", {"maxLength": 64}]
   }
 }
diff --git a/.vscode/settings.json.default b/.vscode/settings.json.default
@@ -6,7 +6,7 @@
   },
   "solidity.linter": "solhint",
   "solidity.enableLocalNodeCompiler": false,
-  "solidity.compileUsingRemoteVersion": "v0.7.1+commit.f4a555be",
+  "solidity.compileUsingRemoteVersion": "v0.8.2+commit.661d1103",
   "solidity.packageDefaultDependenciesContractsDirectory": "",
   "solidity.enabledAsYouTypeCompilationErrorCheck": true,
   "solidity.validationDelay": 1500,

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -9,7 +9,7 @@ import {node_url, accounts} from './utils/network';
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: '0.7.1',
+    version: '0.8.2',
   },
   namedAccounts: {
     deployer: 0,

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@ethersproject/wallet": "^5.0.5",
-    "@openzeppelin/contracts": "^3.2.1-solc-0.7",
+    "@openzeppelin/contracts": "4.0.0-rc.0",
     "@typechain/ethers-v5": "^6.0.0",
     "@typechain/hardhat": "^1.0.1",
     "@types/chai": "^4.2.11",
@@ -35,7 +35,7 @@
     "ethers": "^5.0.17",
     "fs-extra": "^9.0.1",
     "hardhat": "^2.0.10",
-    "hardhat-deploy": "^0.7.0-beta.47",
+    "hardhat-deploy": "^0.7.0-beta.50",
     "hardhat-deploy-ethers": "^0.3.0-beta.7",
     "hardhat-gas-reporter": "^1.0.4",
     "mocha": "^8.1.1",

diff --git a/src/ERC20/ERC20Base.sol b/src/ERC20/ERC20Base.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-1.0
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";

diff --git a/src/ERC20/ERC20Internal.sol b/src/ERC20/ERC20Internal.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-1.0
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 abstract contract ERC20Internal {
     function _approveFor(

diff --git a/src/ERC20/SimpleERC20.sol b/src/ERC20/SimpleERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-1.0
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./ERC20Base.sol";

diff --git a/src/ERC20/WithPermit.sol b/src/ERC20/WithPermit.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-1.0
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 import "./ERC20Internal.sol";
 import "../Interfaces/IERC2612Standalone.sol";

diff --git a/src/ERC20/WithPermitAndFixedDomain.sol b/src/ERC20/WithPermitAndFixedDomain.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-1.0
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 import "./ERC20Internal.sol";
 import "../Interfaces/IERC2612Standalone.sol";

diff --git a/src/GreetingsRegistry/GreetingsRegistry.sol b/src/GreetingsRegistry/GreetingsRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
-import "hardhat-deploy/solc_0.7/proxy/Proxied.sol";
+import "hardhat-deploy/solc_0.8/proxy/Proxied.sol";
 import "hardhat/console.sol";
 
 contract GreetingsRegistry is Proxied {

diff --git a/src/Interfaces/IERC2612.sol b/src/Interfaces/IERC2612.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-1.0
 
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IERC2612Standalone.sol";

diff --git a/src/Interfaces/IERC2612Standalone.sol b/src/Interfaces/IERC2612Standalone.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-1.0
 
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 interface IERC2612Standalone {
     function permit(

diff --git a/src/Libraries/Constants.sol b/src/Libraries/Constants.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-1.0
 
-pragma solidity 0.7.1;
+pragma solidity 0.8.2;
 
 library Constants {
     uint256 internal constant UINT256_MAX = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;

diff --git a/yarn.lock b/yarn.lock
@@ -769,10 +769,10 @@
     safe-buffer "^5.1.1"
     util.promisify "^1.0.0"
 
-"@openzeppelin/contracts@^3.2.1-solc-0.7":
-  version "3.2.1-solc-0.7"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.2.1-solc-0.7.tgz#067a60918b935d4733208edb3d7e35cd1d51026b"
-  integrity sha512-VfKZE9L2HNaZVBR7l5yHbRmap3EiVw9F5iVXRRDdgfnA9vQ1yFanrs0VYmdo2VIXC+EsI9wPPYZY9Ic7/qDBdw==
+"@openzeppelin/contracts@4.0.0-rc.0":
+  version "4.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.0.0-rc.0.tgz#daa9bb22dadf1d1434a96b7fa820c67357a1ac6f"
+  integrity sha512-206BCKet16fUrgYE2zP6L+wtMTbPjN3GmyqSJdRXeF0qw5MdUS0TIy/p3VHVX2+btSwslDyNrB70SN70RUDJQg==
 
 "@sentry/[email protected]":
   version "5.27.1"
@@ -3665,10 +3665,10 @@ hardhat-deploy-ethers@^0.3.0-beta.7:
   resolved "https://registry.yarnpkg.com/hardhat-deploy-ethers/-/hardhat-deploy-ethers-0.3.0-beta.7.tgz#860d86b84ed3c4fdef64283ccf1e8d5623454d02"
   integrity sha512-JKMNte6vudu9LSNqgmBtNxc1gfxp3NUcPKVAf/FANHfl9pa/mBGg6hpQO7tD8CLkAbe6f4K5BjyYIPWX3p7MKw==
 
-hardhat-deploy@^0.7.0-beta.47:
-  version "0.7.0-beta.47"
-  resolved "https://registry.yarnpkg.com/hardhat-deploy/-/hardhat-deploy-0.7.0-beta.47.tgz#974afd2c070e95437842b05bb24ade84962b4057"
-  integrity sha512-7YknSJ2o+ZsYMUtgNg1CW4pj++2cwOpDi4omyCXyktY9Plgudo9vNJwGHxgYU6bLQ6uhCGqICP4WL23beZGsZw==
+hardhat-deploy@^0.7.0-beta.50:
+  version "0.7.0-beta.50"
+  resolved "https://registry.yarnpkg.com/hardhat-deploy/-/hardhat-deploy-0.7.0-beta.50.tgz#e9e8ae0a6b566303f784aa74311d945cc109b857"
+  integrity sha512-WSt/wQYy4TLgwXZrvC4PNM+zpngX8nldhE8/pZ6B7JxovU9LwLhgqa9pvPST+sOhr7fTuBGrO7XyTVq2TgK6YQ==
   dependencies:
     "@ethersproject/abi" "^5.0.2"
     "@ethersproject/abstract-signer" "^5.0.2"