Merge branch 'develop' of github.com:trufflesuite/truffle into eip155…

…-work

.eslintrc.json

@@ -21,6 +21,7 @@
     "@typescript-eslint/semi": [ "error", "always" ],
     "no-mixed-operators": "warn",
     "no-tabs": "warn",
-    "no-useless-escape": "warn"
+    "no-useless-escape": "warn",
+    "no-undef": ["error", { "typeof": true }]
   }
 }

packages/artifactor/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "author": "Tim Coulter",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/artifactor",
-  "version": "4.0.100",
+  "version": "4.0.101",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -20,7 +20,7 @@
     "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "@truffle/contract": "^4.3.12",
+    "@truffle/contract": "^4.3.13",
     "@types/fs-extra": "^8.1.0",
     "@types/lodash.assign": "^4.2.6",
     "@types/lodash.merge": "^4.6.6",

packages/box/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "author": "g. nicholas d'andrea <[email protected]>",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/box",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "main": "dist/box.js",
   "scripts": {
     "build": "tsc",
@@ -13,7 +13,7 @@
   },
   "types": "./typings/index.d.ts",
   "dependencies": {
-    "@truffle/config": "^1.2.36",
+    "@truffle/config": "^1.2.37",
     "download-git-repo": "^3.0.2",
     "fs-extra": "^9.1.0",
     "ignore": "^5.1.8",

packages/codec/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.10.2",
+  "version": "0.10.3",
   "main": "dist/lib/index.js",
   "files": [
     "dist"
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@gnd/typedoc": "0.15.0-0",
     "@truffle/abi-utils": "^0.1.6",
-    "@truffle/compile-common": "^0.7.1",
+    "@truffle/compile-common": "^0.7.2",
     "@truffle/contract-schema": "^3.3.4",
     "@trufflesuite/typedoc-default-themes": "^0.6.1",
     "@types/big.js": "^4.0.5",

packages/compile-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truffle/compile-common",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Common compiler integration support infrastructure for Truffle",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -13,7 +13,7 @@
     "watch": "tsc -w"
   },
   "devDependencies": {
-    "@truffle/config": "^1.2.36",
+    "@truffle/config": "^1.2.37",
     "@truffle/contract-schema": "^3.3.4",
     "@types/fs-extra": "^8.1.0",
     "@types/mocha": "^5.2.7",

packages/compile-solidity/package.json

@@ -8,15 +8,15 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "5.2.4",
+  "version": "5.2.5",
   "main": "index.js",
   "scripts": {
     "prepare": "exit 0",
     "test": "./scripts/test.sh"
   },
   "dependencies": {
-    "@truffle/compile-common": "^0.7.1",
-    "@truffle/config": "^1.2.36",
+    "@truffle/compile-common": "^0.7.2",
+    "@truffle/config": "^1.2.37",
     "@truffle/contract-sources": "^0.1.11",
     "@truffle/expect": "^0.0.15",
     "debug": "^4.3.1",
@@ -31,9 +31,9 @@
     "solc": "^0.6.0"
   },
   "devDependencies": {
-    "@truffle/artifactor": "^4.0.100",
-    "@truffle/box": "^2.1.7",
-    "@truffle/resolver": "^7.0.6",
+    "@truffle/artifactor": "^4.0.101",
+    "@truffle/box": "^2.1.8",
+    "@truffle/resolver": "^7.0.7",
     "babel-core": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",

packages/compile-vyper/package.json

@@ -4,16 +4,16 @@
   "license": "MIT",
   "author": "Evgeniy Filatov <[email protected]>",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-vyper",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "index.js",
   "scripts": {
     "prepare": "exit 0",
     "test": "mocha"
   },
   "dependencies": {
-    "@truffle/compile-common": "^0.7.1",
-    "@truffle/config": "^1.2.36",
-    "@truffle/resolver": "^7.0.6",
+    "@truffle/compile-common": "^0.7.2",
+    "@truffle/config": "^1.2.37",
+    "@truffle/resolver": "^7.0.7",
     "colors": "^1.4.0",
     "debug": "^4.3.1",
     "lodash.partition": "^4.6.0",

packages/config/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "1.2.36",
+  "version": "1.2.37",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@truffle/error": "^0.0.12",
     "@truffle/events": "^0.0.9",
-    "@truffle/provider": "^0.2.27",
+    "@truffle/provider": "^0.2.28",
     "configstore": "^4.0.0",
     "find-up": "^2.1.0",
     "lodash.assignin": "^4.2.0",

packages/contract-tests/package.json

@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.1.29",
+  "version": "0.1.30",
   "scripts": {
     "prepare": "exit 0",
     "test": "./scripts/test.sh",
@@ -21,8 +21,8 @@
   },
   "devDependencies": {
     "@truffle/blockchain-utils": "^0.0.28",
-    "@truffle/compile-solidity": "^5.2.4",
-    "@truffle/contract": "^4.3.12",
+    "@truffle/compile-solidity": "^5.2.5",
+    "@truffle/contract": "^4.3.13",
     "bignumber.js": "^7.2.1",
     "chai": "^4.2.0",
     "debug": "^4.3.1",

packages/contract/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "4.3.12",
+  "version": "4.3.13",
   "main": "index.js",
   "scripts": {
     "compile": "sh -c \"mkdir -p ./dist\" && browserify --debug ./index.js | exorcist ./dist/truffle-contract.js.map > ./dist/truffle-contract.js && uglifyjs ./dist/truffle-contract.js -o ./dist/truffle-contract.min.js",
@@ -19,9 +19,9 @@
   "dependencies": {
     "@truffle/blockchain-utils": "^0.0.28",
     "@truffle/contract-schema": "^3.3.4",
-    "@truffle/debug-utils": "^5.0.12",
+    "@truffle/debug-utils": "^5.0.13",
     "@truffle/error": "^0.0.12",
-    "@truffle/interface-adapter": "^0.4.20",
+    "@truffle/interface-adapter": "^0.4.21",
     "bignumber.js": "^7.2.1",
     "ethereum-ens": "^0.8.0",
     "ethers": "^4.0.32",

packages/core/lib/commands/develop.js

@@ -123,9 +123,11 @@ const command = {
       config.logger.log();
     }
 
-    if (!options.log) {
-      return await command.runConsole(config, ganacheOptions);
+    if (options.log) {
+      // leave the process open so that logging can take place
+      return new Promise(() => {});
     }
+    return await command.runConsole(config, ganacheOptions);
   }
 };
 

packages/core/lib/debug/cli.js

@@ -46,7 +46,11 @@ class CLIDebugger {
     const fetchSpinner = ora(
       "Getting and compiling external sources..."
     ).start();
-    const { badAddresses, badFetchers } = await new DebugExternalHandler(
+    const {
+      badAddresses,
+      badFetchers,
+      badCompilationAddresses
+    } = await new DebugExternalHandler(
       bugger,
       this.config
     ).fetch(); //note: mutates bugger!

packages/core/package.json

@@ -7,7 +7,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "5.3.0",
+  "version": "5.3.2",
   "bin": {
     "truffle": "./cli.js",
     "truffle-exec": "./exec.js"
@@ -17,34 +17,34 @@
     "test": "mocha ./test/** ./test/**/*"
   },
   "dependencies": {
-    "@truffle/artifactor": "^4.0.100",
-    "@truffle/box": "^2.1.7",
-    "@truffle/codec": "^0.10.2",
-    "@truffle/compile-solidity": "^5.2.4",
-    "@truffle/config": "^1.2.36",
-    "@truffle/contract": "^4.3.12",
+    "@truffle/artifactor": "^4.0.101",
+    "@truffle/box": "^2.1.8",
+    "@truffle/codec": "^0.10.3",
+    "@truffle/compile-solidity": "^5.2.5",
+    "@truffle/config": "^1.2.37",
+    "@truffle/contract": "^4.3.13",
     "@truffle/contract-sources": "^0.1.11",
-    "@truffle/debug-utils": "^5.0.12",
-    "@truffle/debugger": "^8.0.20",
-    "@truffle/decoder": "^4.5.7",
-    "@truffle/deployer": "^3.2.19",
-    "@truffle/environment": "^0.2.49",
+    "@truffle/debug-utils": "^5.0.13",
+    "@truffle/debugger": "^8.0.21",
+    "@truffle/decoder": "^4.5.8",
+    "@truffle/deployer": "^3.2.20",
+    "@truffle/environment": "^0.2.50",
     "@truffle/error": "^0.0.12",
     "@truffle/expect": "^0.0.15",
-    "@truffle/interface-adapter": "^0.4.20",
-    "@truffle/migrate": "^3.2.19",
+    "@truffle/interface-adapter": "^0.4.21",
+    "@truffle/migrate": "^3.2.20",
     "@truffle/plugins": "^0.2.0",
     "@truffle/preserve": "^0.2.0",
     "@truffle/preserve-fs": "^0.2.0",
     "@truffle/preserve-to-buckets": "^0.2.0",
     "@truffle/preserve-to-filecoin": "^0.2.0",
     "@truffle/preserve-to-ipfs": "^0.2.0",
-    "@truffle/provider": "^0.2.27",
-    "@truffle/provisioner": "^0.2.14",
-    "@truffle/require": "^2.0.59",
-    "@truffle/resolver": "^7.0.6",
-    "@truffle/source-fetcher": "^0.3.5",
-    "@truffle/workflow-compile": "^3.2.5",
+    "@truffle/provider": "^0.2.28",
+    "@truffle/provisioner": "^0.2.15",
+    "@truffle/require": "^2.0.60",
+    "@truffle/resolver": "^7.0.7",
+    "@truffle/source-fetcher": "^0.3.6",
+    "@truffle/workflow-compile": "^3.2.6",
     "app-module-path": "^2.2.0",
     "chai": "^4.2.0",
     "colors": "^1.4.0",

packages/db-kit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truffle/db-kit",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Utility belt for Truffle and @truffle/db",
   "keywords": [
     "smart-contract",
@@ -55,14 +55,14 @@
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
   "dependencies": {
-    "@truffle/codec": "^0.10.2",
-    "@truffle/compile-common": "^0.7.1",
-    "@truffle/compile-solidity": "^5.2.4",
-    "@truffle/config": "^1.2.36",
-    "@truffle/db": "^0.5.6",
-    "@truffle/decoder": "^4.5.7",
-    "@truffle/environment": "^0.2.49",
-    "@truffle/source-fetcher": "^0.3.5",
+    "@truffle/codec": "^0.10.3",
+    "@truffle/compile-common": "^0.7.2",
+    "@truffle/compile-solidity": "^5.2.5",
+    "@truffle/config": "^1.2.37",
+    "@truffle/db": "^0.5.7",
+    "@truffle/decoder": "^4.5.8",
+    "@truffle/environment": "^0.2.50",
+    "@truffle/source-fetcher": "^0.3.6",
     "ink": "^3.0.8",
     "ink-big-text": "^1.2.0",
     "ink-divider": "^3.0.0",

packages/db/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.5.6",
+  "version": "0.5.7",
   "main": "dist/src/index.js",
   "files": [
     "dist",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@truffle/abi-utils": "^0.1.6",
     "@truffle/code-utils": "^1.2.25",
-    "@truffle/config": "^1.2.36",
+    "@truffle/config": "^1.2.37",
     "apollo-server": "^2.18.2",
     "debug": "^4.3.1",
     "fs-extra": "^9.1.0",
@@ -57,9 +57,9 @@
   },
   "devDependencies": {
     "@gql2ts/from-schema": "^2.0.0-4",
-    "@truffle/compile-common": "^0.7.1",
+    "@truffle/compile-common": "^0.7.2",
     "@truffle/contract-schema": "^3.3.4",
-    "@truffle/workflow-compile": "^3.2.5",
+    "@truffle/workflow-compile": "^3.2.6",
     "@types/debug": "^4.1.5",
     "@types/express": "^4.16.0",
     "@types/graphql": "^14.5.0",

packages/debug-utils/package.json

@@ -8,13 +8,13 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "5.0.12",
+  "version": "5.0.13",
   "main": "index.js",
   "scripts": {
     "prepare": "exit 0"
   },
   "dependencies": {
-    "@truffle/codec": "^0.10.2",
+    "@truffle/codec": "^0.10.3",
     "@trufflesuite/chromafi": "^2.2.2",
     "bn.js": "^5.1.3",
     "chalk": "^2.4.2",

packages/debugger/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "8.0.20",
+  "version": "8.0.21",
   "main": "dist/debugger.js",
   "scripts": {
     "build": "webpack --config webpack/webpack.config.js",
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@truffle/abi-utils": "^0.1.6",
-    "@truffle/codec": "^0.10.2",
-    "@truffle/source-map-utils": "^1.3.36",
+    "@truffle/codec": "^0.10.3",
+    "@truffle/source-map-utils": "^1.3.37",
     "bn.js": "^5.1.3",
     "debug": "^4.3.1",
     "json-pointer": "^0.6.0",
@@ -41,11 +41,11 @@
     "web3-eth-abi": "1.3.5"
   },
   "devDependencies": {
-    "@truffle/artifactor": "^4.0.100",
-    "@truffle/box": "^2.1.7",
-    "@truffle/migrate": "^3.2.19",
-    "@truffle/resolver": "^7.0.6",
-    "@truffle/workflow-compile": "^3.2.5",
+    "@truffle/artifactor": "^4.0.101",
+    "@truffle/box": "^2.1.8",
+    "@truffle/migrate": "^3.2.20",
+    "@truffle/resolver": "^7.0.7",
+    "@truffle/workflow-compile": "^3.2.6",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",