Merge development

5 files changed, 35 insertions, 26 deletions

diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index 3c88bf4e9..d7bca16aa 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "2.0.0",
         "changes": [
             {
@@ -166,8 +175,7 @@
         "version": "1.1.0",
         "changes": [
             {
-                "note":
-                    "Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements.",
+                "note": "Quicken compilation by sending multiple contracts to the same solcjs invocation, batching them together based on compiler version requirements.",
                 "pr": 965
             },
             {
@@ -381,8 +389,7 @@
                 "pr": 426
             },
             {
-                "note":
-                    "Add `bytecode`, `runtime_bytecode`, `source_map`, `source_map_runtime` and `sources` fields to artifacts",
+                "note": "Add `bytecode`, `runtime_bytecode`, `source_map`, `source_map_runtime` and `sources` fields to artifacts",
                 "pr": 426
             },
             {
@@ -390,8 +397,7 @@
                 "pr": 426
             },
             {
-                "note":
-                    "Allow deployer to accept a provider instead of port and host. This makes it possible to run it with in-process ganache-core",
+                "note": "Allow deployer to accept a provider instead of port and host. This makes it possible to run it with in-process ganache-core",
                 "pr": 426
             },
             {
@@ -412,8 +418,7 @@
                 "pr": 408
             },
             {
-                "note":
-                    "Improve an error message for when deployer is supplied with an incorrect number of constructor arguments",
+                "note": "Improve an error message for when deployer is supplied with an incorrect number of constructor arguments",
                 "pr": 419
             }
         ],
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index 6ec804c3a..6ce541e97 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.0.0 - _January 9, 2019_
 
     * Add sol-compiler watch mode with -w flag (#1461)
diff --git a/packages/sol-compiler/README.md b/packages/sol-compiler/README.md
index 445aea315..412a5fc02 100644
--- a/packages/sol-compiler/README.md
+++ b/packages/sol-compiler/README.md
@@ -2,11 +2,11 @@
 
 Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) that adds:
 
-*   Smart re-compilation: Only recompiles when smart contracts have changed
-*   Ability to compile an entire project instead of only individual `.sol` files
-*   Compilation using the Solidity version specified at the top of each individual `.sol` file
-*   Proper parsing of Solidity version ranges
-*   Support for the standard [input description](https://solidity.readthedocs.io/en/develop/using-the-compiler.html#input-description) for what information you'd like added to the resulting `artifacts` file (i.e 100% configurable artifacts content).
+-   Smart re-compilation: Only recompiles when smart contracts have changed
+-   Ability to compile an entire project instead of only individual `.sol` files
+-   Compilation using the Solidity version specified at the top of each individual `.sol` file
+-   Proper parsing of Solidity version ranges
+-   Support for the standard [input description](https://solidity.readthedocs.io/en/develop/using-the-compiler.html#input-description) for what information you'd like added to the resulting `artifacts` file (i.e 100% configurable artifacts content).
 
 ### Read the [Documentation](https://0xproject.com/docs/sol-compiler).
 
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 6c9435bcd..b284317a7 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/sol-compiler",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,8 +42,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/tslint-config": "^2.0.1",
         "@types/chokidar": "^1.7.5",
         "@types/mkdirp": "^0.5.2",
         "@types/pluralize": "^0.0.29",
@@ -67,17 +67,17 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0x/assert": "^1.0.21",
-        "@0x/json-schemas": "^2.1.5",
-        "@0x/sol-resolver": "^1.2.1",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/assert": "^1.0.22",
+        "@0x/json-schemas": "^2.1.6",
+        "@0x/sol-resolver": "^1.2.2",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/yargs": "^11.0.0",
         "chalk": "^2.3.0",
         "chokidar": "^2.0.4",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5",
         "mkdirp": "^0.5.1",
diff --git a/packages/sol-compiler/src/cli.ts b/packages/sol-compiler/src/cli.ts
index 18cc68aaf..db0c09581 100644
--- a/packages/sol-compiler/src/cli.ts
+++ b/packages/sol-compiler/src/cli.ts
@@ -33,8 +33,8 @@ const SEPARATOR = ',';
     const contracts = _.isUndefined(argv.contracts)
         ? undefined
         : argv.contracts === DEFAULT_CONTRACTS_LIST
-            ? DEFAULT_CONTRACTS_LIST
-            : argv.contracts.split(SEPARATOR);
+        ? DEFAULT_CONTRACTS_LIST
+        : argv.contracts.split(SEPARATOR);
     const opts = {
         contractsDir: argv.contractsDir,
         artifactsDir: argv.artifactsDir,