diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-06-08 03:45:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 03:45:18 +0800 |
| commit | 41f005a676b69311099441b170b277e76d5ca25b (patch) | |
| tree | 447ac22825b000074a9ded906466b60a656fa5ce /src/types.ts | |
| parent | 7460acbc0b01df35b21971405d582621150443d4 (diff) | |
| parent | 834b28bfbe26e0331820d978b5be659b27423528 (diff) | |
| download | dexon-0x-contracts-41f005a676b69311099441b170b277e76d5ca25b.tar.gz dexon-0x-contracts-41f005a676b69311099441b170b277e76d5ca25b.tar.zst dexon-0x-contracts-41f005a676b69311099441b170b277e76d5ca25b.zip | |
Merge branch 'master' into batchCancelAsync
Diffstat (limited to 'src/types.ts')
| -rw-r--r-- | src/types.ts | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/types.ts b/src/types.ts index ebd427ae9..00ef17189 100644 --- a/src/types.ts +++ b/src/types.ts @@ -80,6 +80,12 @@ export interface ExchangeContract extends ContractInstance { estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelAmount: BigNumber.BigNumber[], txOpts?: TxOpts) => number; }; + fillOrKill: { + (orderAddresses: OrderAddresses, orderValues: OrderValues, fillAmount: BigNumber.BigNumber, + v: number, r: string, s: string, txOpts?: TxOpts): ContractResponse; + estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, fillAmount: BigNumber.BigNumber, + v: number, r: string, s: string, txOpts?: TxOpts) => number; + }; filled: { call: (orderHash: string) => BigNumber.BigNumber; }; @@ -146,7 +152,7 @@ export const ExchangeContractErrs = strEnum([ 'INSUFFICIENT_MAKER_FEE_ALLOWANCE', 'TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER', 'MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH', - + 'INSUFFICIENT_REMAINING_FILL_AMOUNT', ]); export type ExchangeContractErrs = keyof typeof ExchangeContractErrs; |