1 files changed, 32 insertions, 21 deletions

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 1986e0004..2fcdd2ddb 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -6,46 +6,51 @@ export { ExchangeWrapper } from './contract_wrappers/exchange_wrapper';
 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 { TransactionEncoder } from './utils/transaction_encoder';
 
 export {
     ContractWrappersError,
-    EventCallback,
-    ContractEvent,
-    Token,
     IndexedFilterValues,
     BlockRange,
-    OrderFillRequest,
-    ContractEventArgs,
     ContractWrappersConfig,
     MethodOpts,
     OrderTransactionOpts,
     TransactionOpts,
-    LogEvent,
-    DecodedLogEvent,
-    OnOrderStateChangeCallback,
     OrderStatus,
     OrderInfo,
+    EventCallback,
+    DecodedLogEvent,
+    BalanceAndAllowance,
+    OrderAndTraderInfo,
+    TraderInfo,
+    ValidateOrderFillableOpts,
 } from './types';
 
-export {
-    Order,
-    SignedOrder,
-    ECSignature,
-    OrderStateValid,
-    OrderStateInvalid,
-    OrderState,
-    AssetProxyId,
-} from '@0xproject/types';
+export { Order, SignedOrder, AssetProxyId } from '@0xproject/types';
 
 export {
     BlockParamLiteral,
-    FilterObject,
     BlockParam,
     ContractEventArg,
-    LogWithDecodedArgs,
     Provider,
-    TransactionReceipt,
-    TransactionReceiptWithDecodedLogs,
+    ContractAbi,
+    JSONRPCRequestPayload,
+    JSONRPCResponsePayload,
+    JSONRPCErrorCallback,
+    AbiDefinition,
+    LogWithDecodedArgs,
+    FunctionAbi,
+    EventAbi,
+    EventParameter,
+    DecodedLogArgs,
+    MethodAbi,
+    ConstructorAbi,
+    FallbackAbi,
+    DataItem,
+    ConstructorStateMutability,
+    StateMutability,
 } from 'ethereum-types';
 
 export {
@@ -75,8 +80,14 @@ export {
 export {
     ExchangeCancelUpToEventArgs,
     ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeSignatureValidatorApprovalEventArgs,
     ExchangeFillEventArgs,
     ExchangeCancelEventArgs,
     ExchangeEventArgs,
     ExchangeEvents,
 } from './contract_wrappers/generated/exchange';
+
+export { AbstractBalanceAndProxyAllowanceFetcher, AbstractOrderFilledCancelledFetcher } from '@0xproject/order-utils';
+
+export { AssetBalanceAndProxyAllowanceFetcher } from './fetchers/asset_balance_and_proxy_allowance_fetcher';
+export { OrderFilledCancelledFetcher } from './fetchers/order_filled_cancelled_fetcher';