diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-08 17:31:40 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-08 17:31:40 +0800 |
| commit | c1322717802d652090fb374ac706cb1abf6c26be (patch) | |
| tree | efc3905da0882f1e23b896f06a59e48122bd3532 /src/types.ts | |
| parent | 5d464d87e07003c231fca55e87b95cc7e1e9e978 (diff) | |
| parent | c6645f9f4f470323086d9004cf603a68091d71a3 (diff) | |
| download | dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.gz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.bz2 dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.lz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.xz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.zst dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.zip | |
Merge branch 'master' into batchFillAsync
Diffstat (limited to 'src/types.ts')
| -rw-r--r-- | src/types.ts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/types.ts b/src/types.ts index f3cfa440c..90e64bc46 100644 --- a/src/types.ts +++ b/src/types.ts @@ -86,6 +86,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; }; @@ -151,7 +157,8 @@ 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', + 'INSUFFICIENT_REMAINING_FILL_AMOUNT', ]); export type ExchangeContractErrs = keyof typeof ExchangeContractErrs; |