Merge development

3 files changed, 49 insertions, 28 deletions

diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json
index 9307f7da4..1c48b6280 100644
--- a/contracts/asset-proxy/CHANGELOG.json
+++ b/contracts/asset-proxy/CHANGELOG.json
@@ -1,5 +1,32 @@
 [
     {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.0.0",
         "changes": [
             {
diff --git a/contracts/asset-proxy/CHANGELOG.md b/contracts/asset-proxy/CHANGELOG.md
index 779eb68a7..9600ae19a 100644
--- a/contracts/asset-proxy/CHANGELOG.md
+++ b/contracts/asset-proxy/CHANGELOG.md
@@ -5,24 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v2.2.3 - _January 17, 2019_
+## v1.0.3 - _February 7, 2019_
 
-    * Dependencies updated
+    * Fake publish to enable pinning
 
-## v2.2.2 - _January 15, 2019_
+## v1.0.2 - _February 6, 2019_
 
     * Dependencies updated
 
-## v2.2.1 - _January 11, 2019_
+## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated
 
-## v2.2.0 - _January 9, 2019_
-
-    * Added LibAddressArray (#1383)
-    * Add validation and comments to MultiAssetProxy (#1455)
-    * Move OrderValidator to extensions (#1464)
+## v1.0.0 - _Invalid date_
 
-## v2.1.59 - _December 13, 2018_
-
-    * Dependencies updated
+    * Move all AssetProxy contracts out of contracts-protocol to new package (#1539)
diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json
index ce686b7ef..88ae7e3a5 100644
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,11 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.22",
-        "@0x/dev-utils": "^1.0.24",
-        "@0x/sol-compiler": "^2.0.2",
-        "@0x/tslint-config": "^2.0.2",
         "@0x/contracts-gen": "^1.0.0",
+        "@0x/abi-gen": "^2.0.1",
+        "@0x/dev-utils": "^2.0.1",
+        "@0x/sol-compiler": "^3.0.1",
+        "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
         "chai": "^4.0.1",
@@ -66,17 +66,17 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-test-utils": "^2.0.1",
-        "@0x/contracts-erc20": "1.0.0",
-        "@0x/contracts-erc721": "1.0.0",
-        "@0x/contracts-utils": "3.0.0",
-        "@0x/order-utils": "^3.1.2",
-        "@0x/types": "^1.5.2",
-        "@0x/typescript-typings": "^3.0.8",
-        "@0x/utils": "^3.0.1",
-        "@0x/web3-wrapper": "^3.2.4",
-        "ethereum-types": "^1.1.6",
+        "@0x/base-contract": "^4.0.1",
+        "@0x/contracts-erc20": "^1.0.3",
+        "@0x/contracts-erc721": "^1.0.3",
+        "@0x/contracts-test-utils": "^3.0.2",
+        "@0x/contracts-utils": "^2.0.2",
+        "@0x/order-utils": "^6.0.0",
+        "@0x/types": "^2.0.1",
+        "@0x/typescript-typings": "^4.0.0",
+        "@0x/utils": "^4.0.2",
+        "@0x/web3-wrapper": "^4.0.1",
+        "ethereum-types": "^2.0.0",
         "lodash": "^4.17.5"
     },
     "publishConfig": {