Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/web3-wrapper/unexport-marshaller

3 files changed, 40 insertions, 24 deletions

diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index bc427db09..4c0a4e887 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "timestamp": 1532357734,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {
@@ -31,6 +41,7 @@
         ]
     },
     {
+        "timestamp": 1527009133,
         "version": "0.10.3",
         "changes": [
             {
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index c433721eb..0f27e792e 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -1,25 +1,30 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
-## v0.10.6 - _July 18, 2018_
+## v1.0.1 - _July 23, 2018_
 
     * Dependencies updated
 
-## v0.10.5 - _July 9, 2018_
+## v1.0.0 - _July 20, 2018_
+
+    * Add `RpcSubprovider` with timeout (#874)
+    * Add `EthLightwalletSubprovider` (#775)
 
-    * Update web3-provider-engine to v14.0.6 including the leaked global.XMLHttpRequest bug fix
+## v0.10.6 - _July 18, 2018_
+
+    * Dependencies updated
 
 ## v0.10.4 - _June 19, 2018_
 
     * Dependencies updated
 
-## v0.10.3 - _June 1, 2018_
+## v0.10.3 - _May 22, 2018_
 
-    * Incorrect publish that was unpublished
+    * Define engine type as Provider in setEngine (#675)
 
 ## v0.10.2 - _May 22, 2018_
 
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 1aa5514a7..717446d23 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/subproviders",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,10 +12,8 @@
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
-        "run_mocha_unit":
-            "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
-        "run_mocha_integration":
-            "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
+        "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
+        "run_mocha_integration": "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
         "test": "npm run test:unit",
         "test:unit:coverage": "nyc npm run test:unit --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
@@ -26,31 +24,34 @@
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
         "docs:stage": "node scripts/stage_docs.js",
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
-        "upload_docs_json":
-            "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
+        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
         "postpublish": {
             "assets": [],
             "docPublishConfigs": {
-                "extraFileIncludes": ["../types/src/index.ts", "../ethereum-types/src/index.ts"],
+                "extraFileIncludes": [
+                    "../types/src/index.ts",
+                    "../ethereum-types/src/index.ts"
+                ],
                 "s3BucketPath": "s3://doc-jsons/subproviders/",
                 "s3StagingBucketPath": "s3://staging-doc-jsons/subproviders/"
             }
         }
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/types": "^1.0.0-rc.1",
-        "@0xproject/web3-wrapper": "^1.0.0",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/assert": "^1.0.1",
+        "@0xproject/types": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.1",
+        "@0xproject/utils": "^1.0.1",
+        "@0xproject/web3-wrapper": "^1.0.1",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "^4.3.0",
-        "ethereum-types": "^1.0.0",
+        "@types/hdkey": "^0.7.0",
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
+        "ethereum-types": "^1.0.1",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "ganache-core": "0xProject/ganache-core",
@@ -61,13 +62,12 @@
         "web3-provider-engine": "14.0.6"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.1",
+        "@0xproject/tslint-config": "^1.0.1",
         "@types/bip39": "^2.4.0",
         "@types/bn.js": "^4.11.0",
-        "@types/hdkey": "^0.7.0",
         "@types/ethereumjs-tx": "^1.0.0",
+        "@types/hdkey": "^0.7.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",