From a455864d380d8349db51560dc177e2dc35d727bf Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 29 Apr 2019 18:22:06 -0300 Subject: [PATCH 1/7] update truffle to 5.0.14 --- package-lock.json | 115 +++------------------------------------------- package.json | 2 +- 2 files changed, 7 insertions(+), 110 deletions(-) diff --git a/package-lock.json b/package-lock.json index 802e3ec25f4..3b5c7296122 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11708,114 +11708,11 @@ "yargs": "^11.0.0" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true - }, - "yargs": { - "version": "11.1.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", - "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } } } }, @@ -13121,9 +13018,9 @@ "dev": true }, "truffle": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.0.0.tgz", - "integrity": "sha512-la0TJu+E59Ut62i6cGY0sugeubglDqH5w49a7IrpxZ1nnsDqv6qWB3ibiyYiCp/jr+iI0bLtcr3DKkfQjVDd+g==", + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.0.14.tgz", + "integrity": "sha512-Mlf4S58NMyR8YZFvQLAzA+7eCaDZw6ZSa92NWXDQjy1RbUfpl08/VPa06KLT+LosQuOPZr/NSH9f0u2qxfo/Qw==", "dev": true, "requires": { "app-module-path": "^2.2.0", diff --git a/package.json b/package.json index 47930de8a8c..bb95bc48245 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,6 @@ "solhint": "^1.5.0", "solidity-coverage": "github:rotcivegaf/solidity-coverage#5875f5b7bc74d447f3312c9c0e9fc7814b482477", "solidity-docgen": "^0.2.0-alpha.0", - "truffle": "^5.0.0" + "truffle": "^5.0.14" } } From b0b88553aaa4a35ba9db1e0868b47eb12b89cd99 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 29 Apr 2019 20:05:06 -0300 Subject: [PATCH 2/7] fix setup to test with solc-nightly --- package.json | 2 +- scripts/test.sh | 3 +-- truffle-config.js | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bb95bc48245..f38cb386d4b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "prepack": "npm run build", "release": "scripts/release/release.sh", "version": "scripts/release/update-changelog-release-date.js && scripts/release/update-ethpm-version.js", - "test": "npm run compile && scripts/test.sh" + "test": "scripts/test.sh" }, "repository": { "type": "git", diff --git a/scripts/test.sh b/scripts/test.sh index a68c0ad7ef6..a56500c3ea5 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -63,8 +63,7 @@ else fi if [ "$SOLC_NIGHTLY" = true ]; then - echo "Downloading solc nightly" - wget -q https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin/soljson-nightly.js -O /tmp/soljson.js && find . -name soljson.js -exec cp /tmp/soljson.js {} \; + docker pull ethereum/solc:nightly fi truffle version diff --git a/truffle-config.js b/truffle-config.js index de5297491d8..11456d42339 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -1,5 +1,16 @@ require('chai/register-should'); +const solcStable = { + version: '0.5.7', +}; + +const solcNightly = { + version: 'nightly', + docker: true, +}; + +const useSolcNightly = process.env['SOLC_NIGHTLY'] === 'true'; + module.exports = { networks: { development: { @@ -17,8 +28,6 @@ module.exports = { }, compilers: { - solc: { - version: '0.5.7', - }, + solc: useSolcNightly ? solcNightly : solcStable, }, }; From ec404b866010073219ec1414d4b2564301a01080 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 29 Apr 2019 20:05:43 -0300 Subject: [PATCH 3/7] switch to npx in script/test.sh --- scripts/test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index a56500c3ea5..4997745410c 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -39,9 +39,9 @@ start_ganache() { ) if [ "$SOLIDITY_COVERAGE" = true ]; then - node_modules/.bin/ganache-cli-coverage --emitFreeLogs true --allowUnlimitedContractSize true --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & + npx ganache-cli-coverage --emitFreeLogs true --allowUnlimitedContractSize true --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & else - node_modules/.bin/ganache-cli --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & + npx ganache-cli --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & fi ganache_pid=$! @@ -66,14 +66,14 @@ if [ "$SOLC_NIGHTLY" = true ]; then docker pull ethereum/solc:nightly fi -truffle version +npx truffle version if [ "$SOLIDITY_COVERAGE" = true ]; then - node_modules/.bin/solidity-coverage + npx solidity-coverage if [ "$CONTINUOUS_INTEGRATION" = true ]; then - cat coverage/lcov.info | node_modules/.bin/coveralls + cat coverage/lcov.info | npx coveralls fi else - node_modules/.bin/truffle test "$@" + npx truffle test "$@" fi From c0f69c53b8a1cc7b9c13dfe3cd7b5d7e8c7843f6 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 29 Apr 2019 20:23:17 -0300 Subject: [PATCH 4/7] please the linter --- truffle-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/truffle-config.js b/truffle-config.js index 11456d42339..3f7e50542fa 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -9,7 +9,7 @@ const solcNightly = { docker: true, }; -const useSolcNightly = process.env['SOLC_NIGHTLY'] === 'true'; +const useSolcNightly = process.env.SOLC_NIGHTLY === 'true'; module.exports = { networks: { From eb0f0869e8d2b30c839d38597703a2f387f821e1 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 30 Apr 2019 17:29:39 -0300 Subject: [PATCH 5/7] rename build to prepack --- package.json | 3 +-- scripts/{build.sh => prepack.sh} | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename scripts/{build.sh => prepack.sh} (100%) diff --git a/package.json b/package.json index f38cb386d4b..23c993ac2b7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "test/behaviors" ], "scripts": { - "build": "scripts/build.sh", "compile": "truffle compile", "console": "truffle console", "coverage": "scripts/coverage.sh", @@ -19,7 +18,7 @@ "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", "lint:sol": "solhint --max-warnings 0 \"contracts/**/*.sol\"", - "prepack": "npm run build", + "prepack": "npm run prepack", "release": "scripts/release/release.sh", "version": "scripts/release/update-changelog-release-date.js && scripts/release/update-ethpm-version.js", "test": "scripts/test.sh" diff --git a/scripts/build.sh b/scripts/prepack.sh similarity index 100% rename from scripts/build.sh rename to scripts/prepack.sh From 9c08e5729ab10ae7314241354a0391c933922306 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 30 Apr 2019 17:33:03 -0300 Subject: [PATCH 6/7] move download of nightly build to a compile script --- package.json | 4 ++-- scripts/compile.sh | 7 +++++++ scripts/test.sh | 4 ---- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 scripts/compile.sh diff --git a/package.json b/package.json index 23c993ac2b7..00ec060100b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "test/behaviors" ], "scripts": { - "compile": "truffle compile", + "compile": "scripts/compile.sh", "console": "truffle console", "coverage": "scripts/coverage.sh", "docsite": "scripts/docsite.sh", @@ -21,7 +21,7 @@ "prepack": "npm run prepack", "release": "scripts/release/release.sh", "version": "scripts/release/update-changelog-release-date.js && scripts/release/update-ethpm-version.js", - "test": "scripts/test.sh" + "test": "npm run compile && scripts/test.sh" }, "repository": { "type": "git", diff --git a/scripts/compile.sh b/scripts/compile.sh new file mode 100644 index 00000000000..804d2ed77b6 --- /dev/null +++ b/scripts/compile.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env sh + +if [ "$SOLC_NIGHTLY" = true ]; then + docker pull ethereum/solc:nightly +fi + +truffle compile diff --git a/scripts/test.sh b/scripts/test.sh index 4997745410c..fa8c631b550 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -62,10 +62,6 @@ else start_ganache fi -if [ "$SOLC_NIGHTLY" = true ]; then - docker pull ethereum/solc:nightly -fi - npx truffle version if [ "$SOLIDITY_COVERAGE" = true ]; then From 4f4f95c4c89d388826b1e737c6b0ee3e096d702f Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 1 May 2019 21:41:19 -0300 Subject: [PATCH 7/7] make compile script executable --- scripts/compile.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/compile.sh diff --git a/scripts/compile.sh b/scripts/compile.sh old mode 100644 new mode 100755