From 43b648e7dc1ea49aff3ab1e6883aa6e069fae72f Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Thu, 20 Dec 2018 15:39:19 -0800
Subject: Dutch wrapper

---
 packages/contract-wrappers/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/contract-wrappers/src/index.ts')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index d66ff5c9c..5c64dbbc6 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -34,6 +34,7 @@ export { ERC20ProxyWrapper } from './contract_wrappers/erc20_proxy_wrapper';
 export { ERC721ProxyWrapper } from './contract_wrappers/erc721_proxy_wrapper';
 export { ForwarderWrapper } from './contract_wrappers/forwarder_wrapper';
 export { OrderValidatorWrapper } from './contract_wrappers/order_validator_wrapper';
+export { DutchAuctionWrapper } from './contract_wrappers/dutch_auction_wrapper';
 
 export { TransactionEncoder } from './utils/transaction_encoder';
 
-- 
cgit v1.2.3


From edb989fbf381201752309a1e2aa5dcf6837b67d0 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Sun, 23 Dec 2018 16:04:09 -0800
Subject: export dutch auction wrapper types from 0x.js

---
 packages/contract-wrappers/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/contract-wrappers/src/index.ts')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 5c64dbbc6..cf0ec405f 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -55,6 +55,7 @@ export {
     OrderAndTraderInfo,
     TraderInfo,
     ValidateOrderFillableOpts,
+    DutchAuctionData,
 } from './types';
 
 export { Order, SignedOrder, AssetProxyId } from '@0x/types';
-- 
cgit v1.2.3


From d0a0673694f26a2e9f8e562d335a34cdc1e9c8b2 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Sun, 23 Dec 2018 17:14:34 -0800
Subject: Doc generation working for changes by dutch auction wrapper

---
 packages/contract-wrappers/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/contract-wrappers/src/index.ts')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index cf0ec405f..bf9c27018 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -58,7 +58,7 @@ export {
     DutchAuctionData,
 } from './types';
 
-export { Order, SignedOrder, AssetProxyId } from '@0x/types';
+export { AssetData, DutchAuctionDetails, ERC20AssetData, ERC721AssetData, Order, SignedOrder, AssetProxyId } from '@0x/types';
 
 export {
     BlockParamLiteral,
-- 
cgit v1.2.3


From e39ae0350b744227bca73001c90101f0b8613193 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Sun, 23 Dec 2018 17:29:12 -0800
Subject: Ran prettier

---
 packages/contract-wrappers/src/index.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'packages/contract-wrappers/src/index.ts')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index bf9c27018..853194d6f 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -58,7 +58,15 @@ export {
     DutchAuctionData,
 } from './types';
 
-export { AssetData, DutchAuctionDetails, ERC20AssetData, ERC721AssetData, Order, SignedOrder, AssetProxyId } from '@0x/types';
+export {
+    AssetData,
+    DutchAuctionDetails,
+    ERC20AssetData,
+    ERC721AssetData,
+    Order,
+    SignedOrder,
+    AssetProxyId,
+} from '@0x/types';
 
 export {
     BlockParamLiteral,
-- 
cgit v1.2.3


From 04db7f0fae02ef29795d0f65deb71e64b5552233 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Mon, 7 Jan 2019 13:08:44 -0800
Subject: Fixed merge conflict from development

---
 packages/contract-wrappers/src/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'packages/contract-wrappers/src/index.ts')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 853194d6f..69bbe3c91 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -60,9 +60,12 @@ export {
 
 export {
     AssetData,
-    DutchAuctionDetails,
     ERC20AssetData,
     ERC721AssetData,
+    SingleAssetData,
+    MultiAssetData,
+    MultiAssetDataWithRecursiveDecoding,
+    DutchAuctionDetails,
     Order,
     SignedOrder,
     AssetProxyId,
-- 
cgit v1.2.3