From 9325bd8cb4d3b0f3bbf241a52bd60cda77972236 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Jun 2017 12:39:44 +0200 Subject: Add initial batchCancelAsync implementation --- src/types.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/types.ts') diff --git a/src/types.ts b/src/types.ts index 5407b0121..6c217fe51 100644 --- a/src/types.ts +++ b/src/types.ts @@ -74,6 +74,12 @@ export interface ExchangeContract extends ContractInstance { estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, cancelAmount: BigNumber.BigNumber, txOpts?: TxOpts) => number; }; + batchCancel: { + (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelAmount: BigNumber.BigNumber[], + txOpts?: TxOpts): ContractResponse; + estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelAmount: BigNumber.BigNumber[], + txOpts?: TxOpts) => number; + }; filled: { call: (orderHash: string) => BigNumber.BigNumber; }; -- cgit From c3cd5812e61359b18c469f70c9f0240db777e67a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Jun 2017 14:40:28 +0200 Subject: Refactor to use OrderCancellationRequest --- src/types.ts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/types.ts') diff --git a/src/types.ts b/src/types.ts index 6c217fe51..1034893a4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -222,3 +222,8 @@ export interface SubscriptionOpts { } export type DoneCallback = (err?: Error) => void; + +export interface OrderCancellationRequest { + order: Order|SignedOrder; + takerTokenCancelAmount: BigNumber.BigNumber; +} -- cgit From badbaa39fc000e6febced9d8d0118565af7648dc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Jun 2017 17:46:55 +0200 Subject: Address feedback --- src/types.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src/types.ts') diff --git a/src/types.ts b/src/types.ts index 1034893a4..c58e5fd02 100644 --- a/src/types.ts +++ b/src/types.ts @@ -145,6 +145,7 @@ export const ExchangeContractErrs = strEnum([ 'INSUFFICIENT_MAKER_FEE_BALANCE', 'INSUFFICIENT_MAKER_FEE_ALLOWANCE', 'TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER', + 'MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH' ]); export type ExchangeContractErrs = keyof typeof ExchangeContractErrs; -- cgit From 7460acbc0b01df35b21971405d582621150443d4 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Jun 2017 17:53:45 +0200 Subject: Fix linter error --- src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/types.ts') diff --git a/src/types.ts b/src/types.ts index c58e5fd02..ebd427ae9 100644 --- a/src/types.ts +++ b/src/types.ts @@ -145,7 +145,7 @@ export const ExchangeContractErrs = strEnum([ 'INSUFFICIENT_MAKER_FEE_BALANCE', 'INSUFFICIENT_MAKER_FEE_ALLOWANCE', 'TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER', - 'MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH' + 'MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH', ]); export type ExchangeContractErrs = keyof typeof ExchangeContractErrs; -- cgit