merge v2-prototype

1 files changed, 13 insertions, 1 deletions

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index b3c4b2c60..e5485d7a6 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -1,7 +1,10 @@
 export { ContractWrappers } from './contract_wrappers';
 export { ERC20TokenWrapper } from './contract_wrappers/erc20_token_wrapper';
+export { ERC721TokenWrapper } from './contract_wrappers/erc721_token_wrapper';
 export { EtherTokenWrapper } from './contract_wrappers/ether_token_wrapper';
+export { ExchangeWrapper } from './contract_wrappers/exchange_wrapper';
 export { ERC20ProxyWrapper } from './contract_wrappers/erc20_proxy_wrapper';
+export { ERC721ProxyWrapper } from './contract_wrappers/erc721_proxy_wrapper';
 
 export {
     ContractWrappersError,
@@ -23,7 +26,15 @@ export {
     OrderInfo,
 } from './types';
 
-export { Order, SignedOrder, ECSignature, OrderStateValid, OrderStateInvalid, OrderState } from '@0xproject/types';
+export {
+    Order,
+    SignedOrder,
+    ECSignature,
+    OrderStateValid,
+    OrderStateInvalid,
+    OrderState,
+    AssetProxyId,
+} from '@0xproject/types';
 
 export {
     BlockParamLiteral,
@@ -57,6 +68,7 @@ export {
     ERC721TokenApprovalForAllEventArgs,
     ERC721TokenTransferEventArgs,
     ERC721TokenEvents,
+    ERC721TokenEventArgs,
 } from './contract_wrappers/generated/erc721_token';
 
 export {