Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/upgrade-allowance-toggles-to-locks-and-checks

4 files changed, 45 insertions, 10 deletions

diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index 975f83037..7bf28dfa8 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,12 +1,31 @@
 [
     {
+        "timestamp": 1532619515,
+        "version": "1.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1532614997,
+        "version": "1.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.1.0",
         "changes": [
             {
                 "note": "Add `getTransactionByHashAsync` method",
                 "pr": 847
             }
-        ]
+        ],
+        "timestamp": 1532605697
     },
     {
         "timestamp": 1532357734,
@@ -22,6 +41,10 @@
         "version": "1.0.0",
         "changes": [
             {
+                "note": "Stop exporting `marshaller` utility file.",
+                "pr": 902
+            },
+            {
                 "note": "Export `marshaller` utility file.",
                 "pr": 829
             },
diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md
index b17baaeeb..4ebd92a75 100644
--- a/packages/web3-wrapper/CHANGELOG.md
+++ b/packages/web3-wrapper/CHANGELOG.md
@@ -5,12 +5,25 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.2 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.1.1 - _July 26, 2018_
+
+    * Dependencies updated
+
+## v1.1.0 - _July 26, 2018_
+
+    * Add `getTransactionByHashAsync` method (#847)
+
 ## v1.0.1 - _July 23, 2018_
 
     * Dependencies updated
 
 ## v1.0.0 - _July 20, 2018_
 
+    * Stop exporting `marshaller` utility file. (#902)
     * Export `marshaller` utility file. (#829)
     * Add `getNodeTypeAsync` method (#812)
     * Stop exporting uniqueVersionIds object (#897)
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index d9c577ea9..d0f55c905 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/web3-wrapper",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -45,8 +45,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.4",
+        "@0xproject/tslint-config": "^1.0.4",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
@@ -64,11 +64,11 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.0",
-        "@0xproject/json-schemas": "^1.0.0-rc.1",
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
-        "ethereum-types": "^1.0.0",
+        "@0xproject/assert": "^1.0.4",
+        "@0xproject/json-schemas": "^1.0.1-rc.3",
+        "@0xproject/typescript-typings": "^1.0.3",
+        "@0xproject/utils": "^1.0.4",
+        "ethereum-types": "^1.0.3",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "lodash": "^4.17.4"
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index 4433b4b54..6787e0102 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -1,3 +1,2 @@
 export { Web3Wrapper } from './web3_wrapper';
 export { Web3WrapperErrors, NodeType } from './types';
-export { marshaller } from './marshaller';