Fix merge

0xProject · Aug 14, 2018 · 10dc3ea · 10dc3ea
2 parents c320c87 + fadd292
commit 10dc3ea
Show file tree

Hide file tree

Showing 88 changed files with 667 additions and 415 deletions.
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
@@ -18,7 +18,8 @@
                 "pr": 914,
                 "note": "Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts"
             }
-        ]
+        ],
+        "timestamp": 1534210131
     },
     {
         "version": "1.0.1-rc.2",

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.1-rc.3 - _August 13, 2018_
+
+    * Dependencies updated
+    * Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
+
 ## v1.0.1-rc.2 - _July 26, 2018_
 
     * Fixed bug caused by importing non-existent dep
@@ -17,11 +22,11 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.2 - _July 20, 2018_
+## v1.0.0-rc.2 - _July 19, 2018_
 
     * Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`
 
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
 
     * Remove tokenRegistry wrapper (#863)
     * Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
@@ -61,7 +66,7 @@ CHANGELOG
     * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
     * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
 
-## v0.37.2 - _May 5, 2018_
+## v0.37.2 - _May 4, 2018_
 
     * Dependencies updated
 

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,11 +57,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
-        "@0xproject/dev-utils": "^1.0.3",
-        "@0xproject/migrations": "^1.0.3",
-        "@0xproject/monorepo-scripts": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.4",
+        "@0xproject/migrations": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -87,18 +87,18 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
-        "@0xproject/base-contract": "^1.0.4",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.2",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
-        "@0xproject/order-watcher": "1.0.1-rc.2",
-        "@0xproject/sol-compiler": "^1.0.4",
-        "@0xproject/subproviders": "^1.0.4",
-        "@0xproject/types": "^1.0.1-rc.3",
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
-        "@0xproject/web3-wrapper": "^1.1.2",
-        "ethereum-types": "^1.0.3",
+        "@0xproject/assert": "^1.0.5",
+        "@0xproject/base-contract": "^2.0.0-rc.1",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.3",
+        "@0xproject/order-utils": "^1.0.1-rc.3",
+        "@0xproject/sol-compiler": "^1.0.5",
+        "@0xproject/order-watcher": "1.0.1-rc.3",
+        "@0xproject/subproviders": "^1.0.5",
+        "@0xproject/types": "^1.0.1-rc.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
+        "@0xproject/web3-wrapper": "^1.2.0",
+        "ethereum-types": "^1.0.4",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1534210131,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1532619515,
         "version": "1.0.4",

diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _August 13, 2018_
+
+    * Dependencies updated
+
 ## v1.0.4 - _July 26, 2018_
 
     * Dependencies updated
@@ -21,7 +25,7 @@ CHANGELOG
 
     * Fix the abi-gen entry point in package.json (#901)
 
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
 
     * Convert e_r_c to erc in generated file names (#822)
     * Remove the output directory before writing to it (#822)
@@ -39,15 +43,15 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.3.1 - _June 1, 2018_
+## v0.3.1 - _May 31, 2018_
 
     * Incorrect publish that was unpublished
 
 ## v0.3.0 - _May 22, 2018_
 
     * Properly export the executable binary (#588)
 
-## v0.2.13 - _May 5, 2018_
+## v0.2.13 - _May 4, 2018_
 
     * Dependencies updated
 

diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -32,10 +32,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.3",
+        "ethereum-types": "^1.0.4",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.5",
@@ -46,8 +46,8 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",

diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1534210131,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1532619515,
         "version": "1.0.4",

diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _August 13, 2018_
+
+    * Dependencies updated
+
 ## v1.0.4 - _July 26, 2018_
 
     * Dependencies updated
@@ -21,7 +25,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
 
     * Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values (#821)
 
@@ -37,15 +41,15 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.2.11 - _June 1, 2018_
+## v0.2.11 - _May 31, 2018_
 
     * Incorrect publish that was unpublished
 
 ## v0.2.10 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.2.9 - _May 5, 2018_
+## v0.2.9 - _May 4, 2018_
 
     * Dependencies updated
 

diff --git a/packages/assert/package.json b/packages/assert/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/assert",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
@@ -47,9 +47,9 @@
         "typescript": "2.9.2"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.1-rc.3",
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
+        "@0xproject/json-schemas": "^1.0.1-rc.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
         "lodash": "^4.17.5",
         "valid-url": "^1.0.9"
     },

diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
@@ -6,7 +6,8 @@
                 "pr": 915,
                 "note": "Added strict encoding/decoding checks for sendTransaction and call"
             }
-        ]
+        ],
+        "timestamp": 1534210131
     },
     {
         "timestamp": 1532619515,

diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.0-rc.1 - _August 13, 2018_
+
+    * Added strict encoding/decoding checks for sendTransaction and call (#915)
+
 ## v1.0.4 - _July 26, 2018_
 
     * Dependencies updated
@@ -21,7 +25,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
 
     * Dependencies updated
 
@@ -37,15 +41,15 @@ CHANGELOG
 
     * Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
 
-## v0.3.3 - _June 1, 2018_
+## v0.3.3 - _May 31, 2018_
 
     * Incorrect publish that was unpublished
 
 ## v0.3.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.3.1 - _May 5, 2018_
+## v0.3.1 - _May 4, 2018_
 
     * Dependencies updated
 

diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "1.0.4",
+    "version": "2.0.0-rc.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
@@ -43,10 +43,10 @@
         "typescript": "2.9.2"
     },
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
-        "@0xproject/web3-wrapper": "^1.1.2",
-        "ethereum-types": "^1.0.3",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
+        "@0xproject/web3-wrapper": "^1.2.0",
+        "ethereum-types": "^1.0.4",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1534210131,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1532619515,
         "version": "1.0.4",

diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _August 13, 2018_
+
+    * Dependencies updated
+
 ## v1.0.4 - _July 26, 2018_
 
     * Dependencies updated
@@ -21,7 +25,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0 - _July 20, 2018_
+## v1.0.0 - _July 19, 2018_
 
     * Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`
 
@@ -45,7 +49,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.6.12 - _May 5, 2018_
+## v0.6.12 - _May 4, 2018_
 
     * Dependencies updated