diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-06-09 00:33:19 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-09 00:33:19 +0800 |
commit | c94485dfbba388f481ca6c10bd62b863d7429223 (patch) | |
tree | 1faaa6e52e941831034469c9bc56a47bfc9a6a19 /src/types.ts | |
parent | 7f6a6dd18983980c08c53b2b561ec57dfaed755f (diff) | |
parent | 743ba29918715e21c7891b3c7426dcb5fdc14e17 (diff) | |
download | dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar.gz dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar.bz2 dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar.lz dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar.xz dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.tar.zst dexon-sol-tools-c94485dfbba388f481ca6c10bd62b863d7429223.zip |
Merge branch 'master' into fillOrderUpToAsync
Diffstat (limited to 'src/types.ts')
-rw-r--r-- | src/types.ts | 11 |
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; |