merge v2-prototype

1 files changed, 36 insertions, 23 deletions

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 5c7ad6e1c..95ca07eea 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -1,32 +1,38 @@
 export { ZeroEx } from './0x';
 
+export { MessagePrefixType, MessagePrefixOpts } from '@0xproject/order-utils';
+export { Web3ProviderEngine, RPCSubprovider } from '@0xproject/subproviders';
+
 export {
-    BlockParamLiteral,
-    FilterObject,
-    BlockParam,
-    ContractEventArg,
     ExchangeContractErrs,
-    LogWithDecodedArgs,
     Order,
-    Provider,
     SignedOrder,
     ECSignature,
     OrderStateValid,
     OrderStateInvalid,
     OrderState,
     Token,
-    TransactionReceipt,
-    TransactionReceiptWithDecodedLogs,
+    ERC20AssetData,
+    ERC721AssetData,
+    AssetProxyId,
 } from '@0xproject/types';
 
-export { OrderWatcherConfig } from '@0xproject/order-watcher';
+export {
+    BlockParamLiteral,
+    FilterObject,
+    BlockParam,
+    LogWithDecodedArgs,
+    ContractEventArg,
+    Provider,
+    TransactionReceipt,
+    TransactionReceiptWithDecodedLogs,
+} from 'ethereum-types';
 
 export {
     EventCallback,
     ContractEvent,
     IndexedFilterValues,
     BlockRange,
-    OrderCancellationRequest,
     OrderFillRequest,
     ContractEventArgs,
     MethodOpts,
@@ -36,18 +42,25 @@ export {
     DecodedLogEvent,
     OnOrderStateChangeCallback,
     ContractWrappersError,
-    EtherTokenContractEventArgs,
-    WithdrawalContractEventArgs,
-    DepositContractEventArgs,
-    EtherTokenEvents,
-    TransferContractEventArgs,
-    ApprovalContractEventArgs,
-    TokenContractEventArgs,
-    TokenEvents,
-    LogErrorContractEventArgs,
-    LogCancelContractEventArgs,
-    LogFillContractEventArgs,
-    ExchangeContractEventArgs,
-    ExchangeEvents,
+    WETH9Events,
+    WETH9WithdrawalEventArgs,
+    WETH9ApprovalEventArgs,
+    WETH9EventArgs,
+    WETH9DepositEventArgs,
+    WETH9TransferEventArgs,
+    ERC20TokenTransferEventArgs,
+    ERC20TokenApprovalEventArgs,
+    ERC20TokenEvents,
+    ERC20TokenEventArgs,
+    ERC721TokenApprovalEventArgs,
+    ERC721TokenApprovalForAllEventArgs,
+    ERC721TokenTransferEventArgs,
+    ERC721TokenEvents,
+    ExchangeCancelUpToEventArgs,
+    ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeFillEventArgs,
+    ExchangeCancelEventArgs,
+    ExchangeEventArgs,
     ContractWrappersConfig,
+    OrderInfo,
 } from '@0xproject/contract-wrappers';