Merge branch 'master' into erc20transfer

1 files changed, 8 insertions, 7 deletions

diff --git a/src/types.ts b/src/types.ts
index 418cf9802..5b514bdc4 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -14,14 +14,10 @@ export const ZeroExError = strEnum([
   'UNHANDLED_ERROR',
   'USER_HAS_NO_ASSOCIATED_ADDRESSES',
   'INVALID_SIGNATURE',
+  'CONTRACT_NOT_DEPLOYED_ON_NETWORK',
 ]);
 export type ZeroExError = keyof typeof ZeroExError;
 
-export const InternalError = strEnum([
-  'PROXY_ADDRESS_NOT_FOUND',
-]);
-export type InternalError = keyof typeof InternalError;
-
 /**
  * Elliptic Curve signature
  */
@@ -42,8 +38,8 @@ export interface TokenContract {
     allowance: {
         call: (ownerAddress: string, allowedAddress: string) => Promise<BigNumber.BigNumber>;
     };
-    transfer: (to: string, amountInBaseUnits: BigNumber.BigNumber, opts: any) => Promise<boolean>;
-    approve: (proxyAddress: string, amountInBaseUnits: BigNumber.BigNumber, opts: any) => void;
+    transfer: (to: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => Promise<boolean>;
+    approve: (proxyAddress: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => void;
 }
 
 export interface TokenRegistryContract {
@@ -71,3 +67,8 @@ export interface Token {
     decimals: number;
     url: string;
 };
+
+export interface TxOpts {
+    from: string;
+    gas?: number;
+};