From 94ea7cc45104f9225bcb1d1905ffc4f2dbf27348 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 17 Jul 2018 15:31:25 +0200
Subject: Export assetDataUtils from 0x.js

---
 packages/0x.js/src/0x.ts | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 5d9a03719..11ceb7c89 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -10,6 +10,7 @@ import {
     ExchangeWrapper,
 } from '@0xproject/contract-wrappers';
 import {
+    assetDataUtils,
     ecSignOrderHashAsync,
     generatePseudoRandomSalt,
     isValidSignatureAsync,
@@ -34,6 +35,10 @@ export class ZeroEx {
      * this constant for your convenience.
      */
     public static NULL_ADDRESS = constants.NULL_ADDRESS;
+    /**
+     * A set of methods to easily decode/encode assetData fields found in 0x orders.
+     */
+    public assetData = assetDataUtils;
     /**
      * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
      */
-- 
cgit v1.2.3


From f2393de59bf77806281ebabfad9f4500dd183f4a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 17 Jul 2018 15:33:49 +0200
Subject: Make assetData a static property and add to CHANGELOG

---
 packages/0x.js/CHANGELOG.json | 3 +++
 packages/0x.js/src/0x.ts      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 9419311dd..849432c5a 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -36,6 +36,9 @@
             {
                 "note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block",
                 "pr": 875
+            },
+            {
+                "note": "Export ZeroEx.assetData with methods to decode/encode AssetData fields found in 0x orders"
             }
         ]
     },
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 11ceb7c89..e321b4020 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -38,7 +38,7 @@ export class ZeroEx {
     /**
      * A set of methods to easily decode/encode assetData fields found in 0x orders.
      */
-    public assetData = assetDataUtils;
+    public static assetData = assetDataUtils;
     /**
      * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
      */
-- 
cgit v1.2.3


From 1de70e447458d4913a293dda04315ec53d9c7ffe Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 17 Jul 2018 15:40:06 +0200
Subject: Add PR

---
 packages/0x.js/CHANGELOG.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 849432c5a..5f3d4a0d5 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -38,7 +38,8 @@
                 "pr": 875
             },
             {
-                "note": "Export ZeroEx.assetData with methods to decode/encode AssetData fields found in 0x orders"
+                "note": "Export ZeroEx.assetData with methods to decode/encode AssetData fields found in 0x orders",
+                "pr": 884
             }
         ]
     },
-- 
cgit v1.2.3


From 50ed7d2af26d6210f869352ed41084875d2af3d0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 17 Jul 2018 16:41:55 +0200
Subject: Export missing types and add to doc ref whitelist

---
 packages/0x.js/src/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 95faa860d..95ca07eea 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -12,6 +12,9 @@ export {
     OrderStateInvalid,
     OrderState,
     Token,
+    ERC20AssetData,
+    ERC721AssetData,
+    AssetProxyId,
 } from '@0xproject/types';
 
 export {
@@ -59,4 +62,5 @@ export {
     ExchangeCancelEventArgs,
     ExchangeEventArgs,
     ContractWrappersConfig,
+    OrderInfo,
 } from '@0xproject/contract-wrappers';
-- 
cgit v1.2.3


From b9e7973a0f92661f2e469b748a162b0d3bb53624 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 18 Jul 2018 14:53:38 +0200
Subject: edit changelog message

---
 packages/0x.js/CHANGELOG.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 5f3d4a0d5..4bbefbda4 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -38,7 +38,7 @@
                 "pr": 875
             },
             {
-                "note": "Export ZeroEx.assetData with methods to decode/encode AssetData fields found in 0x orders",
+                "note": "Export ZeroEx.assetData with methods to decode/encode assetData fields found in 0x orders",
                 "pr": 884
             }
         ]
-- 
cgit v1.2.3