From 568dcbe7d6a40eb767ba9b44e89954f8b849be0d Mon Sep 17 00:00:00 2001 From: vittominacori Date: Thu, 22 Oct 2020 18:38:25 +0200 Subject: [PATCH] chore: update to solidity 0.7.4 --- .nvmrc | 2 +- .travis.yml | 9 +++------ buidler.config.js | 2 +- package.json | 32 ++++++++++++++------------------ truffle-config.js | 2 +- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.nvmrc b/.nvmrc index f599e28..48082f7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -10 +12 diff --git a/.travis.yml b/.travis.yml index d0e33c8..6bac93d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ -dist: trusty +os: linux +dist: xenial group: beta language: node_js node_js: - - "10" + - "12" -# for some reason caching fails build cache: directories: - node_modules jobs: - # XXX fast_finish doesn't work with stages yet. See - # https://github.com/travis-ci/travis-ci/issues/8425 - # --elopio - 20180531 fast_finish: true allow_failures: - env: SOLC_NIGHTLY=true diff --git a/buidler.config.js b/buidler.config.js index cdcff8e..3dd5dc9 100644 --- a/buidler.config.js +++ b/buidler.config.js @@ -13,7 +13,7 @@ module.exports = { }, }, solc: { - version: '0.7.1', + version: '0.7.4', optimizer: { enabled: true, runs: 200, diff --git a/package.json b/package.json index a378ee8..8112974 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "erc-payable-token", - "version": "3.2.0", + "version": "3.2.1", "description": "ERC-1363 Payable Token Implementation", "files": [ "contracts", @@ -43,32 +43,28 @@ }, "homepage": "https://vittominacori.github.io/erc1363-payable-token", "dependencies": { - "@openzeppelin/contracts": "3.2.0-solc-0.7" + "@openzeppelin/contracts": "3.2.1-solc-0.7" }, "devDependencies": { - "@nomiclabs/buidler": "^1.4.5", + "@nomiclabs/buidler": "^1.4.8", "@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.4", + "@openzeppelin/test-helpers": "^0.5.7", + "@vuepress/plugin-google-analytics": "^1.7.1", "chai": "^4.2.0", "coveralls": "^3.1.0", - "eslint": "^7.8.1", - "eslint-config-standard": "^14.1.1", - "eslint-plugin-import": "^2.22.0", + "eslint": "^7.11.0", + "eslint-config-standard": "^15.0.0", + "eslint-plugin-import": "^2.22.1", "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.5", - "ethjs-abi": "^0.2.1", - "ganache-cli": "^6.10.2", - "pify": "^5.0.0", - "solhint": "^3.2.0", - "solidity-coverage": "^0.7.10", - "truffle": "5.1.44", - "vuepress": "^1.5.4", - "web3": "^1.2.11" + "eslint-plugin-standard": "^4.0.2", + "ganache-cli": "^6.12.0", + "solhint": "^3.2.2", + "solidity-coverage": "^0.7.11", + "truffle": "^5.1.49", + "vuepress": "^1.7.1" } } diff --git a/truffle-config.js b/truffle-config.js index 48e452d..65f5c65 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -1,7 +1,7 @@ require('chai/register-should'); const solcStable = { - version: '0.7.1', + version: '0.7.4', settings: { optimizer: { enabled: true,