diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-01 01:26:18 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-01 01:26:18 +0800 |
commit | 886ed9180d4e59f6ef1e72509d003726a5a898e9 (patch) | |
tree | 528727ff19cc54e2d51a6a794acd9c52a1a980f5 /src/types.ts | |
parent | 82a46b4938902009896bef1d296b887f66b284fd (diff) | |
parent | 1c765cd55f227d99941f5944ff60022884890fe1 (diff) | |
download | dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar.gz dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar.bz2 dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar.lz dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar.xz dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.tar.zst dexon-sol-tools-886ed9180d4e59f6ef1e72509d003726a5a898e9.zip |
Merge branch 'master' into fillOrderAsync
Diffstat (limited to 'src/types.ts')
-rw-r--r-- | src/types.ts | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/types.ts b/src/types.ts index b70afe298..8c378816f 100644 --- a/src/types.ts +++ b/src/types.ts @@ -14,14 +14,10 @@ export const ZeroExError = strEnum([ 'UNHANDLED_ERROR', 'USER_HAS_NO_ASSOCIATED_ADDRESSES', 'INVALID_SIGNATURE', + 'CONTRACT_NOT_DEPLOYED_ON_NETWORK', ]); export type ZeroExError = keyof typeof ZeroExError; -export const InternalError = strEnum([ - 'PROXY_ADDRESS_NOT_FOUND', -]); -export type InternalError = keyof typeof InternalError; - /** * Elliptic Curve signature */ @@ -57,8 +53,8 @@ export interface TokenContract { allowance: { call: (ownerAddress: string, allowedAddress: string) => Promise<BigNumber.BigNumber>; }; - transfer: (to: string, amountInBaseUnits: BigNumber.BigNumber, opts: any) => Promise<boolean>; - approve: (proxyAddress: string, amountInBaseUnits: BigNumber.BigNumber, opts: any) => void; + transfer: (to: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => Promise<boolean>; + approve: (proxyAddress: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => void; } export interface TokenRegistryContract { @@ -122,3 +118,8 @@ export interface Token { decimals: number; url: string; } + +export interface TxOpts { + from: string; + gas?: number; +} |