update to solidity 0.7.1

vittominacori · Sep 13, 2020 · 07de2ff · 07de2ff
1 parent 4cd0625
commit 07de2ff
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -4,7 +4,9 @@
     "func-order": "off",
     "mark-callable-contracts": "off",
     "no-empty-blocks": "off",
-    "compiler-version": ["error", "0.6.0"],
-    "private-vars-leading-underscore": "error"
+    "compiler-version": ["error", "^0.7.0"],
+    "private-vars-leading-underscore": "error",
+    "reason-string": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }]
   }
 }
diff --git a/analysis/control-flow/SampleContract.png b/analysis/control-flow/SampleContract.png
diff --git a/analysis/description-table/SampleContract.md b/analysis/description-table/SampleContract.md
@@ -5,7 +5,7 @@
 
 |  File Name  |  SHA-1 Hash  |
 |-------------|--------------|
-| dist/SampleContract.dist.sol | 907102b9fa208938bfc023e0837a7bb5208371c8 |
+| dist/SampleContract.dist.sol | 89f607904d5418dd2f23ac2e2602329e928602cf |
 
 
 ### Contracts Description Table
@@ -28,7 +28,7 @@
 | └ | _msgData | Internal 🔒 |   | |
 ||||||
 | **Ownable** | Implementation | Context |||
-| └ | <Constructor> | Internal 🔒 | 🛑  | |
+| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |
 | └ | owner | Public ❗️ |   |NO❗️ |
 | └ | renounceOwnership | Public ❗️ | 🛑  | onlyOwner |
 | └ | transferOwnership | Public ❗️ | 🛑  | onlyOwner |

diff --git a/buidler.config.js b/buidler.config.js
@@ -13,7 +13,7 @@ module.exports = {
     },
   },
   solc: {
-    version: '0.6.12',
+    version: '0.7.1',
     optimizer: {
       enabled: true,
       runs: 200,

diff --git a/contracts/SampleContract.sol b/contracts/SampleContract.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 import "eth-token-recover/contracts/TokenRecover.sol";
 
@@ -14,7 +14,7 @@ contract SampleContract is TokenRecover {
         _;
     }
 
-    constructor() public {
+    constructor() {
         _creator = owner();
     }
 

diff --git a/contracts/mocks/ERC20Mock.sol b/contracts/mocks/ERC20Mock.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
@@ -12,7 +12,7 @@ contract ERC20Mock is ERC20 {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable ERC20(name, symbol) {
+    ) ERC20(name, symbol) {
         _mint(initialAccount, initialBalance);
     }
 }
diff --git a/dist/SampleContract.dist.sol b/dist/SampleContract.dist.sol
@@ -3,7 +3,7 @@
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.
@@ -83,7 +83,7 @@ interface IERC20 {
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 /*
  * @dev Provides information about the current execution context, including the
@@ -110,7 +110,7 @@ abstract contract Context {
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 /**
  * @dev Contract module which provides a basic access control mechanism, where
@@ -132,7 +132,7 @@ contract Ownable is Context {
     /**
      * @dev Initializes the contract setting the deployer as the initial owner.
      */
-    constructor () internal {
+    constructor () {
         address msgSender = _msgSender();
         _owner = msgSender;
         emit OwnershipTransferred(address(0), msgSender);
@@ -180,7 +180,7 @@ contract Ownable is Context {
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 
 
@@ -205,7 +205,7 @@ contract TokenRecover is Ownable {
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.7.0;
 
 
 contract SampleContract is TokenRecover {
@@ -218,7 +218,7 @@ contract SampleContract is TokenRecover {
         _;
     }
 
-    constructor() public {
+    constructor() {
         _creator = owner();
     }
 

diff --git a/package.json b/package.json
@@ -56,37 +56,37 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@nomiclabs/buidler": "^1.4.4",
+    "@nomiclabs/buidler": "^1.4.5",
     "@nomiclabs/buidler-ganache": "^1.3.3",
     "@nomiclabs/buidler-truffle5": "^1.3.4",
     "@nomiclabs/buidler-web3": "^1.3.4",
     "@openzeppelin/test-helpers": "^0.5.6",
     "@vuepress/plugin-google-analytics": "^1.5.3",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
-    "eslint": "^7.7.0",
+    "eslint": "^7.8.1",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-mocha-no-only": "^1.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "ethereumjs-util": "^7.0.4",
+    "ethereumjs-util": "^7.0.5",
     "ethjs-abi": "^0.2.1",
-    "ganache-cli": "^6.10.1",
+    "ganache-cli": "^6.10.2",
     "lite-server": "^2.5.4",
     "pify": "^5.0.0",
-    "sol2uml": "^1.1.17",
+    "sol2uml": "^1.1.18",
     "solhint": "^3.2.0",
-    "solidity-coverage": "^0.7.9",
-    "surya": "^0.4.0",
-    "truffle": "^5.1.41",
-    "truffle-flattener": "^1.4.4",
+    "solidity-coverage": "^0.7.10",
+    "surya": "github:vittominacori/surya#feature/update-solidity-parser",
+    "truffle": "^5.1.44",
+    "truffle-flattener": "github:vittominacori/truffle-flattener#feature/allow-constructor-without-visibility",
     "vuepress": "^1.5.3",
     "web3": "^1.2.11"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "3.1.0",
-    "eth-token-recover": "3.1.0"
+    "@openzeppelin/contracts": "3.2.0-solc-0.7",
+    "eth-token-recover": "3.2.0"
   }
 }
diff --git a/truffle-config.js b/truffle-config.js
@@ -1,7 +1,7 @@
 require('chai/register-should');
 
 const solcStable = {
-  version: '0.6.12',
+  version: '0.7.1',
   settings: {
     optimizer: {
       enabled: true,