From 70508f52a1dd6bfcc891f145c3a06f1e66c3cda5 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Wed, 2 Jan 2019 17:17:40 -0800
Subject: Update CHANGELOGs

---
 packages/0x.js/CHANGELOG.json             | 5 +++--
 packages/0x.js/src/index.ts               | 2 ++
 packages/contract-wrappers/CHANGELOG.json | 6 +++++-
 packages/order-utils/CHANGELOG.json       | 3 ++-
 packages/types/src/index.ts               | 2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 0024052b3..29dbf12f5 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,9 +1,10 @@
 [
     {
-        "version": "2.0.9",
+        "version": "2.1.0",
         "changes": [
             {
-                "note": "Export `MultiAssetData` from types",
+                "note":
+                    "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types",
                 "pr": 1363
             }
         ]
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 01742f1b9..c8978466d 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -71,6 +71,7 @@ export { AbiDecoder } from '@0x/utils';
 export { BigNumber } from '@0x/utils';
 
 export {
+    AssetData,
     ExchangeContractErrs,
     Order,
     SignedOrder,
@@ -85,6 +86,7 @@ export {
     MultiAssetData,
     MultiAssetDataWithRecursiveDecoding,
     SignatureType,
+    ObjectMap,
     OrderRelevantState,
     Stats,
 } from '@0x/types';
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
index d39027797..a8c74fa24 100644
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,9 +1,13 @@
 [
     {
-        "version": "4.1.4",
+        "version": "4.2.0",
         "changes": [
             {
                 "note": "Add support for Trust Wallet signature denial error"
+            },
+            {
+                "note": "Add balance and allowance queries for MultiAssetProxy",
+                "pr": 1363
             }
         ]
     },
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index a6fb91b83..292f7a57b 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -3,7 +3,8 @@
         "version": "3.1.0",
         "changes": [
             {
-                "note": "Use new ABI encoder and add encoding/decoding logic for MultiAsset assetData",
+                "note":
+                    "Use new ABI encoder, add encoding/decoding logic for MultiAsset assetData, and add information to return values in orderStateUtils",
                 "pr": 1363
             }
         ]
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 71fcbf9db..472b56dc2 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -185,6 +185,8 @@ export interface MultiAssetDataWithRecursiveDecoding {
     nestedAssetData: SingleAssetData[];
 }
 
+export type AssetData = SingleAssetData | MultiAssetData | MultiAssetDataWithRecursiveDecoding;
+
 // TODO: DRY. These should be extracted from contract code.
 export enum RevertReason {
     OrderUnfillable = 'ORDER_UNFILLABLE',
-- 
cgit v1.2.3