Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync

# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts

1 files changed, 8 insertions, 1 deletions

diff --git a/src/types.ts b/src/types.ts
index 18de4d27e..992bb4b00 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -31,7 +31,7 @@ export type OrderAddresses = [string, string, string, string, string];
 
 export type OrderValues = [
     BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber,
-    BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber,
+    BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber
 ];
 
 export interface ExchangeContract {
@@ -79,6 +79,13 @@ export enum ExchangeContractErrCodes {
     ERROR_CANCEL_NO_VALUE, // Order has already been fully filled or cancelled
 }
 
+export const FillOrderValidationErrs = strEnum([
+    'FILL_AMOUNT_IS_ZERO',
+    'NOT_A_TAKER',
+    'EXPIRED',
+]);
+export type FillOrderValidationErrs = keyof typeof FillOrderValidationErrs;
+
 export interface ContractResponse {
     logs: ContractEvent[];
 }