1 files changed, 8 insertions, 43 deletions
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index d68a81b51..6340c4a51 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -1,4 +1,4 @@
-import { Order } from '@0xproject/types';
+import { Order, OrderWithoutExchangeAddress } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { AbiDefinition, ContractAbi } from 'ethereum-types';
 
@@ -19,37 +19,31 @@ export interface SubmissionContractEventArgs {
 }
 
 export interface BatchFillOrders {
-    orders: Order[];
+    orders: OrderWithoutExchangeAddress[];
     signatures: string[];
     takerAssetFillAmounts: BigNumber[];
 }
 
 export interface MarketSellOrders {
-    orders: Order[];
+    orders: OrderWithoutExchangeAddress[];
     signatures: string[];
     takerAssetFillAmount: BigNumber;
 }
 
 export interface MarketBuyOrders {
-    orders: Order[];
+    orders: OrderWithoutExchangeAddress[];
     signatures: string[];
     makerAssetFillAmount: BigNumber;
 }
 
 export interface BatchCancelOrders {
-    orders: Order[];
+    orders: OrderWithoutExchangeAddress[];
 }
 
 export interface CancelOrdersBefore {
     salt: BigNumber;
 }
 
-export enum AssetProxyId {
-    INVALID,
-    ERC20,
-    ERC721,
-}
-
 export interface TransactionDataParams {
     name: string;
     abi: AbiDefinition[];
@@ -115,18 +109,6 @@ export enum ContractName {
     Whitelist = 'Whitelist',
 }
 
-export enum SignatureType {
-    Illegal,
-    Invalid,
-    EIP712,
-    Ecrecover,
-    TxOrigin,
-    Caller,
-    Contract,
-    PreSigned,
-    Trezor,
-}
-
 export interface SignedTransaction {
     exchangeAddress: string;
     salt: BigNumber;
@@ -162,31 +144,14 @@ export interface OrderInfo {
     orderTakerAssetFilledAmount: BigNumber;
 }
 
-export interface ERC20ProxyData {
-    assetProxyId: AssetProxyId;
-    tokenAddress: string;
-}
-
-export interface ERC721ProxyData {
-    assetProxyId: AssetProxyId;
-    tokenAddress: string;
-    tokenId: BigNumber;
-}
-
-export interface ProxyData {
-    assetProxyId: AssetProxyId;
-    tokenAddress?: string;
-    data?: any;
-}
-
 export interface CancelOrder {
-    order: Order;
+    order: OrderWithoutExchangeAddress;
     takerAssetCancelAmount: BigNumber;
 }
 
 export interface MatchOrder {
-    left: Order;
-    right: Order;
+    left: OrderWithoutExchangeAddress;
+    right: OrderWithoutExchangeAddress;
     leftSignature: string;
     rightSignature: string;
 }