Merge branch 'v2-prototype' into feature/order-watcher-v2

3 files changed, 13 insertions, 0 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 9419311dd..4bbefbda4 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -36,6 +36,10 @@
             {
                 "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",
+                "pr": 884
             }
         ]
     },
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 1d33eb7ca..385ba76b5 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,
@@ -35,6 +36,10 @@ export class ZeroEx {
      */
     public static NULL_ADDRESS = constants.NULL_ADDRESS;
     /**
+     * A set of methods to easily decode/encode assetData fields found in 0x orders.
+     */
+    public static assetData = assetDataUtils;
+    /**
      * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
      */
     public exchange: ExchangeWrapper;
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';