Skip to content

Commit

Permalink
update to solidity 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vittominacori committed Sep 12, 2020
1 parent 5c73a85 commit bf4d574
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
6 changes: 4 additions & 2 deletions .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }]
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ npm install eth-token-recover
## Usage

```solidity
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "eth-token-recover/contracts/TokenRecover.sol";
Expand Down
2 changes: 1 addition & 1 deletion buidler.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
},
},
solc: {
version: '0.6.10',
version: '0.7.1',
optimizer: {
enabled: true,
runs: 200,
Expand Down
3 changes: 1 addition & 2 deletions contracts/TokenRecover.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.6.0;
pragma solidity ^0.7.0;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

import "@openzeppelin/contracts/access/Ownable.sol";

/**
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/ERC20Mock.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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);
}
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eth-token-recover",
"version": "3.1.0",
"version": "3.2.0",
"description": "TokenRecover allows the contract owner to recover any ERC20 token sent into the contract for error",
"files": [
"contracts",
Expand Down Expand Up @@ -44,32 +44,32 @@
},
"homepage": "https://github.com/vittominacori/eth-token-recover",
"dependencies": {
"@openzeppelin/contracts": "3.1.0"
"@openzeppelin/contracts": "3.2.0-solc-0.7"
},
"devDependencies": {
"@nomiclabs/buidler": "^1.3.8",
"@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.2",
"@vuepress/plugin-google-analytics": "^1.5.4",
"chai": "^4.2.0",
"coveralls": "^3.1.0",
"eslint": "^7.3.1",
"eslint": "^7.8.1",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-mocha-no-only": "^1.1.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.2",
"ethereumjs-util": "^7.0.5",
"ethjs-abi": "^0.2.1",
"ganache-cli": "^6.10.0-beta.2",
"ganache-cli": "^6.10.2",
"pify": "^5.0.0",
"solhint": "^3.0.0",
"solidity-coverage": "^0.7.9",
"truffle": "^5.1.32",
"vuepress": "^1.5.2",
"web3": "^1.2.9"
"solhint": "^3.2.0",
"solidity-coverage": "^0.7.10",
"truffle": "^5.1.44",
"vuepress": "^1.5.4",
"web3": "^1.2.11"
}
}
2 changes: 1 addition & 1 deletion truffle-config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('chai/register-should');

const solcStable = {
version: '0.6.10',
version: '0.7.1',
settings: {
optimizer: {
enabled: true,
Expand Down

0 comments on commit bf4d574

Please sign in to comment.