Merge branch 'dev-2.1.0' into 483-484-fix

Author: maxsam4

package.json

@@ -63,38 +63,33 @@
     "babel-register": "6.26.0",
     "bignumber.js": "5.0.0",
     "chalk": "^2.4.1",
-    "coveralls": "^3.0.1",
-    "csv-parse": "^4.0.1",
-    "ethereumjs-testrpc": "^6.0.3",
-    "ethers": "^4.0.7",
+    "coveralls": "^3.0.2",
+    "csv-parse": "^4.2.0",
+    "ethers": "^4.0.20",
     "fs": "0.0.2",
     "openzeppelin-solidity": "1.10.0",
     "prompt": "^1.0.0",
-    "readline-sync": "^1.4.9",
-    "request": "^2.88.0",
-    "request-promise": "^4.2.2",
-    "solc": "^0.4.24",
-    "truffle-contract": "^3.0.4",
-    "truffle-hdwallet-provider-privkey": "0.2.0",
+    "truffle-hdwallet-provider-privkey": "0.3.0",
     "web3": "1.0.0-beta.34"
   },
   "devDependencies": {
-    "@soldoc/soldoc": "^0.4.3",
-    "eslint": "^5.8.0",
+    "eslint": "^5.10.0",
     "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.10.0",
+    "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "ethereum-bridge": "^0.6.1",
     "ethereumjs-abi": "^0.6.5",
-    "ganache-cli": "^6.1.8",
+    "ganache-cli": "^6.2.5",
     "mocha-junit-reporter": "^1.18.0",
-    "prettier": "^1.14.3",
-    "sol-merger": "^0.1.2",
+    "prettier": "^1.15.3",
+    "request": "^2.88.0",
+    "request-promise": "^4.2.2",
+    "sol-merger": "^0.1.3",
     "solidity-coverage": "^0.5.11",
     "solidity-docgen": "^0.1.0",
-    "solium": "^1.1.6",
+    "solium": "^1.1.8",
     "truffle": "4.1.14",
     "truffle-wallet-provider": "0.0.5"
   },

scripts/test.sh

@@ -91,7 +91,7 @@ fi
 if [ "$COVERAGE" = true ] || [ "$TRAVIS_PULL_REQUEST" > 0 ] && [ "$NOT_FORK" != true ]; then
   curl -o node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js
   node_modules/.bin/solidity-coverage
-  if [ "$CIRCLECI" = true ]; then
+  if [ "$CIRCLECI" = true ] || [ "$TRAVIS_PULL_REQUEST" > 0 ] && [ "$NOT_FORK" != true ]; then
     cat coverage/lcov.info | node_modules/.bin/coveralls || echo 'Failed to report coverage to Coveralls'
   fi
 else