Skip to content

Commit

Permalink
chore: update to solidity 0.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
vittominacori committed Oct 22, 2020
1 parent 7ec24bd commit 8ede7ab
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
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.7.1',
version: '0.7.4',
optimizer: {
enabled: true,
runs: 200,
Expand Down
30 changes: 13 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,37 +56,33 @@
],
"license": "MIT",
"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.3",
"@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": "^7.10.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.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",
"ganache-cli": "^6.11.0",
"lite-server": "^2.5.4",
"pify": "^5.0.0",
"sol2uml": "^1.1.18",
"solhint": "^3.2.0",
"solidity-coverage": "^0.7.10",
"surya": "github:vittominacori/surya#feature/update-solidity-parser",
"truffle": "5.1.44",
"solhint": "^3.2.2",
"solidity-coverage": "^0.7.11",
"surya": "^0.4.1",
"truffle": "^5.1.49",
"truffle-flattener": "^1.5.0",
"vuepress": "^1.5.3",
"web3": "^1.2.11"
"vuepress": "^1.7.1"
},
"dependencies": {
"@openzeppelin/contracts": "3.2.0-solc-0.7",
"eth-token-recover": "3.2.0"
"@openzeppelin/contracts": "3.2.1-solc-0.7",
"eth-token-recover": "3.2.1"
}
}
13 changes: 7 additions & 6 deletions scripts/analyze.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/usr/bin/env bash

CONTRACT_NAME=SampleContract

npm run flat

surya inheritance dist/$CONTRACT_NAME.dist.sol | dot -Tpng > analysis/inheritance-tree/$CONTRACT_NAME.png
for contract in "SampleContract"
do
npx surya inheritance dist/$contract.dist.sol | dot -Tpng > analysis/inheritance-tree/$contract.png

surya graph dist/$CONTRACT_NAME.dist.sol | dot -Tpng > analysis/control-flow/$CONTRACT_NAME.png
npx surya graph dist/$contract.dist.sol | dot -Tpng > analysis/control-flow/$contract.png

surya mdreport analysis/description-table/$CONTRACT_NAME.md dist/$CONTRACT_NAME.dist.sol
npx surya mdreport analysis/description-table/$contract.md dist/$contract.dist.sol

sol2uml dist/$CONTRACT_NAME.dist.sol -o analysis/uml/$CONTRACT_NAME.svg
npx sol2uml dist/$contract.dist.sol -o analysis/uml/$contract.svg
done
7 changes: 4 additions & 3 deletions scripts/flat.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash

CONTRACT_NAME=SampleContract

truffle-flattener contracts/$CONTRACT_NAME.sol > dist/$CONTRACT_NAME.dist.sol
for contract in "SampleContract"
do
npx truffle-flattener contracts/$contract.sol > dist/$contract.dist.sol
done
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.7.1',
version: '0.7.4',
settings: {
optimizer: {
enabled: true,
Expand Down

0 comments on commit 8ede7ab

Please sign in to comment.