diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-09-05 00:14:48 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-09-05 00:14:48 +0800 |
commit | 1ad395cf86b2006c09bdae814607c2baf9790b91 (patch) | |
tree | d05ed1febd8979b7967a42faaed45c3dd10356dd /src/types.ts | |
parent | 1c2d4cbb1af9a5d4442857def622dc8068086953 (diff) | |
download | dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar.gz dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar.bz2 dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar.lz dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar.xz dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.tar.zst dexon-sol-tools-1ad395cf86b2006c09bdae814607c2baf9790b91.zip |
Make the functions immidiately return txHash instead of awaiting for a transaction to be mined
Diffstat (limited to 'src/types.ts')
-rw-r--r-- | src/types.ts | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/types.ts b/src/types.ts index 2400a9a60..9f8ba9729 100644 --- a/src/types.ts +++ b/src/types.ts @@ -14,6 +14,7 @@ export enum ZeroExError { InsufficientWEthBalanceForWithdrawal = 'INSUFFICIENT_WETH_BALANCE_FOR_WITHDRAWAL', InvalidJump = 'INVALID_JUMP', OutOfGas = 'OUT_OF_GAS', + NoNetworkId = 'NO_NETWORK_ID', } /** @@ -60,7 +61,7 @@ export interface ExchangeContract extends ContractInstance { fillOrder: { (orderAddresses: OrderAddresses, orderValues: OrderValues, fillTakerTokenAmount: BigNumber.BigNumber, shouldThrowOnInsufficientBalanceOrAllowance: boolean, - v: number, r: string, s: string, txOpts?: TxOpts): Promise<ContractResponse>; + v: number, r: string, s: string, txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, fillTakerTokenAmount: BigNumber.BigNumber, shouldThrowOnInsufficientBalanceOrAllowance: boolean, @@ -69,7 +70,7 @@ export interface ExchangeContract extends ContractInstance { batchFillOrders: { (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmounts: BigNumber.BigNumber[], shouldThrowOnInsufficientBalanceOrAllowance: boolean, - v: number[], r: string[], s: string[], txOpts?: TxOpts): Promise<ContractResponse>; + v: number[], r: string[], s: string[], txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmounts: BigNumber.BigNumber[], shouldThrowOnInsufficientBalanceOrAllowance: boolean, @@ -78,7 +79,7 @@ export interface ExchangeContract extends ContractInstance { fillOrdersUpTo: { (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmount: BigNumber.BigNumber, shouldThrowOnInsufficientBalanceOrAllowance: boolean, - v: number[], r: string[], s: string[], txOpts?: TxOpts): Promise<ContractResponse>; + v: number[], r: string[], s: string[], txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmount: BigNumber.BigNumber, shouldThrowOnInsufficientBalanceOrAllowance: boolean, @@ -86,28 +87,28 @@ export interface ExchangeContract extends ContractInstance { }; cancelOrder: { (orderAddresses: OrderAddresses, orderValues: OrderValues, cancelTakerTokenAmount: BigNumber.BigNumber, - txOpts?: TxOpts): Promise<ContractResponse>; + txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, cancelTakerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts) => Promise<number>; }; batchCancelOrders: { (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelTakerTokenAmounts: BigNumber.BigNumber[], - txOpts?: TxOpts): Promise<ContractResponse>; + txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelTakerTokenAmounts: BigNumber.BigNumber[], txOpts?: TxOpts) => Promise<number>; }; fillOrKillOrder: { (orderAddresses: OrderAddresses, orderValues: OrderValues, fillTakerTokenAmount: BigNumber.BigNumber, - v: number, r: string, s: string, txOpts?: TxOpts): Promise<ContractResponse>; + v: number, r: string, s: string, txOpts?: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, fillTakerTokenAmount: BigNumber.BigNumber, v: number, r: string, s: string, txOpts?: TxOpts) => Promise<number>; }; batchFillOrKillOrders: { (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmounts: BigNumber.BigNumber[], - v: number[], r: string[], s: string[], txOpts: TxOpts): Promise<ContractResponse>; + v: number[], r: string[], s: string[], txOpts: TxOpts): Promise<string>; estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], fillTakerTokenAmounts: BigNumber.BigNumber[], v: number[], r: string[], s: string[], txOpts?: TxOpts) => Promise<number>; @@ -209,6 +210,7 @@ export enum ExchangeContractErrs { InsufficientRemainingFillAmount = 'INSUFFICIENT_REMAINING_FILL_AMOUNT', MultipleTakerTokensInFillUpToDisallowed = 'MULTIPLE_TAKER_TOKENS_IN_FILL_UP_TO_DISALLOWED', BatchOrdersMustHaveSameExchangeAddress = 'BATCH_ORDERS_MUST_HAVE_SAME_EXCHANGE_ADDRESS', + BatchOrdersMustHaveAtLeastOneItem = 'BATCH_ORDERS_MUST_HAVE_AT_LEAST_ONE_ITEM', } export interface ContractResponse { @@ -351,10 +353,7 @@ export type AsyncMethod = (...args: any[]) => Promise<any>; export interface ContractInstance { address: string; -} - -export interface Artifact { - networks: {[networkId: number]: any}; + abi: Web3.ContractAbi; } export interface ContractEventEmitter { @@ -373,14 +372,6 @@ export interface ExchangeContractByAddress { [address: string]: ExchangeContract; } -export interface ContractArtifact { - networks: { - [networkId: number]: { - address: string; - }; - }; -} - export interface JSONRPCPayload { params: any[]; method: string; |