Merge branch 'master' into fillOrderUpToAsync

1 files changed, 11 insertions, 0 deletions

diff --git a/src/types.ts b/src/types.ts
index 2dabfaa3c..53476ab85 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -98,6 +98,12 @@ export interface ExchangeContract extends ContractInstance {
         estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, fillAmount: BigNumber.BigNumber,
                       v: number, r: string, s: string, txOpts?: TxOpts) => number;
     };
+    batchFillOrKill: {
+        (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillValuesT: BigNumber.BigNumber[],
+         v: number[], r: string[], s: string[], txOpts: TxOpts): ContractResponse;
+        estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillValuesT: BigNumber.BigNumber[],
+                      v: number[], r: string[], s: string[], txOpts?: TxOpts) => number;
+    };
     filled: {
         call: (orderHash: string) => BigNumber.BigNumber;
     };
@@ -243,6 +249,11 @@ export interface SubscriptionOpts {
 
 export type DoneCallback = (err?: Error) => void;
 
+export interface OrderFillOrKillRequest {
+    signedOrder: SignedOrder;
+    fillTakerAmount: BigNumber.BigNumber;
+}
+
 export interface OrderCancellationRequest {
     order: Order|SignedOrder;
     takerTokenCancelAmount: BigNumber.BigNumber;