Merge branch 'development' into feature/instant/usd-eth-toggle

4 files changed, 50 insertions, 31 deletions

diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json
index 5ff58c035..19ac770af 100644
--- a/contracts/tokens/CHANGELOG.json
+++ b/contracts/tokens/CHANGELOG.json
@@ -1,15 +1,10 @@
 [
     {
-        "name": "ZRXToken",
-        "version": "1.0.0",
+        "timestamp": 1544741676,
+        "version": "1.0.2",
         "changes": [
             {
-                "note": "protocol v1 deploy",
-                "networks": {
-                    "1": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-                    "3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00",
-                    "42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa"
-                }
+                "note": "Dependencies updated"
             }
         ]
     }
diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md
new file mode 100644
index 000000000..716353d05
--- /dev/null
+++ b/contracts/tokens/CHANGELOG.md
@@ -0,0 +1,10 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.2 - _December 13, 2018_
+
+    * Dependencies updated
diff --git a/contracts/tokens/DEPLOYS.json b/contracts/tokens/DEPLOYS.json
new file mode 100644
index 000000000..5ff58c035
--- /dev/null
+++ b/contracts/tokens/DEPLOYS.json
@@ -0,0 +1,16 @@
+[
+    {
+        "name": "ZRXToken",
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "protocol v1 deploy",
+                "networks": {
+                    "1": "0xe41d2489571d322189246dafa5ebde1f4699f498",
+                    "3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00",
+                    "42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa"
+                }
+            }
+        ]
+    }
+]
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 05fe3272b..6f8a366dd 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,7 +1,6 @@
 {
-    "private": true,
     "name": "@0x/contracts-tokens",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -19,8 +18,7 @@
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
-        "run_mocha":
-            "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
+        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "compile": "sol-compiler --contracts-dir contracts",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
         "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
@@ -45,13 +43,13 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/contracts-test-utils": "^1.0.0",
-        "@0x/abi-gen": "^1.0.17",
-        "@0x/dev-utils": "^1.0.19",
-        "@0x/sol-compiler": "^1.1.14",
-        "@0x/sol-cov": "^2.1.14",
-        "@0x/subproviders": "^2.1.6",
-        "@0x/tslint-config": "^1.0.10",
+        "@0x/abi-gen": "^1.0.19",
+        "@0x/contracts-test-utils": "^1.0.2",
+        "@0x/dev-utils": "^1.0.21",
+        "@0x/sol-compiler": "^1.1.16",
+        "@0x/sol-cov": "^2.1.16",
+        "@0x/subproviders": "^2.1.8",
+        "@0x/tslint-config": "^2.0.0",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -60,8 +58,8 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
         "dirty-chai": "^2.0.1",
-        "make-promises-safe": "^1.1.0",
         "ethereumjs-abi": "0.6.5",
+        "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
@@ -72,19 +70,19 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.8",
-        "@0x/order-utils": "^3.0.4",
-        "@0x/contracts-multisig": "^1.0.0",
-        "@0x/contracts-utils": "^1.0.0",
-        "@0x/contracts-libs": "^1.0.0",
-        "@0x/contracts-interfaces": "^1.0.0",
-        "@0x/types": "^1.3.0",
-        "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.6",
-        "@0x/web3-wrapper": "^3.1.6",
+        "@0x/base-contract": "^3.0.10",
+        "@0x/contracts-interfaces": "^1.0.2",
+        "@0x/contracts-libs": "^1.0.2",
+        "@0x/contracts-multisig": "^1.0.2",
+        "@0x/contracts-utils": "^1.0.2",
+        "@0x/order-utils": "^3.0.7",
+        "@0x/types": "^1.4.1",
+        "@0x/typescript-typings": "^3.0.6",
+        "@0x/utils": "^2.0.8",
+        "@0x/web3-wrapper": "^3.2.1",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.2",
+        "ethereum-types": "^1.1.4",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },