aboutsummaryrefslogtreecommitdiffstats
path: root/src/types.ts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into batchFillOrKillFabio Berger2017-06-091-0/+11
|\
| * Fix names in typesLeonid Logvinov2017-06-081-2/+2
| * Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-081-1/+8
| |\
| * \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-0/+5
| |\ \
| * | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-0/+5
| |\| |
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+6
| * | | Use ContractInstance from globalsLeonid Logvinov2017-06-071-3/+0
| * | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-071-0/+6
* | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into batchCancelAsyncLeonid2017-06-081-1/+7
| |\ \ \
| * | | | Fix linter errorLeonid Logvinov2017-06-071-1/+1
| * | | | Address feedbackLeonid Logvinov2017-06-071-0/+1
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-071-0/+5
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+6
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-081-0/+11
| |/ / |/| |
* | | make txOpts optionalFabio Berger2017-06-071-2/+2
* | | remove spaceFabio Berger2017-06-071-1/+0
* | | merge masterFabio Berger2017-06-071-5/+17
|\| |
| * | Use ContractInstance from globalsLeonid Logvinov2017-06-071-3/+0
| |/
| * Make txOpts optionalLeonid Logvinov2017-06-071-7/+7
| * Address feedbackLeonid Logvinov2017-06-071-3/+6
| * Add missing semicolonLeonid Logvinov2017-06-061-1/+1
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-061-0/+4
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-061-0/+2
| * Add initial implementation with success testLeonid Logvinov2017-06-061-0/+6
* | Implement fillOrKill & testsFabio Berger2017-06-071-4/+11
|/
* Make methods accept senderAccountLeonid Logvinov2017-06-051-2/+2
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-031-4/+50
|\
| * Consolidate the ExchangeContract type and flesh out type definition for isVal...Fabio Berger2017-06-031-20/+19
| * Be more specific with blockParam valid valuesFabio Berger2017-06-031-2/+4
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-031-19/+26
| |\
| * | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-021-0/+41
* | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-031-0/+9
|\ \ \
| * \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-031-23/+26
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-0/+4
| |\ \
| * \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-0/+4
| |\ \ \
| * \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-2/+64
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-011-0/+1
| |\ \ \ \ \
| * | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa...Fabio Berger2017-06-011-0/+9
* | | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-031-7/+80
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-031-5/+6
| * | | | | | Address feedbackLeonid Logvinov2017-06-031-8/+8
| * | | | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-031-9/+3
| * | | | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-021-1/+1
| * | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-021-1/+1
| * | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-021-1/+1
| * | | | | | Improve error names and remove duplicate importFabio Berger2017-06-021-3/+3
| * | | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
| |\ \ \ \ \ \
| * | | | | | | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-021-0/+7
| * | | | | | | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-021-0/+5
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-021-0/+4
| | |_|_|_|/ | |/| | | |
| * | | | | Add not enough taker balance testsLeonid Logvinov2017-06-021-0/+4
| | |_|_|/ | |/| | |
| * | | | rename txData to txOptsFabio Berger2017-06-011-2/+2
| * | | | Add EXPIRED error typeLeonid Logvinov2017-06-011-0/+1
| * | | | Revert "Add EXPIRED test"Leonid Logvinov2017-06-011-1/+0
| * | | | Add ExchangeContractErrs string enumFabio Berger2017-06-011-0/+8
| * | | | fix formattingFabio Berger2017-06-011-4/+2
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-1/+8
| |\ \ \ \
| | * | | | Add EXPIRED testLeonid Logvinov2017-06-011-1/+2
| | * | | | Add NOT_A_TAKER checkLeonid Logvinov2017-06-011-0/+1
| | * | | | Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-011-0/+5
| * | | | | Rename ExchangeContractErrs to ExchangeContractErrCodesFabio Berger2017-06-011-1/+1
| |/ / / /
| * | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.jsFabio Berger2017-06-011-2/+2
| * | | | Type estimateGasLeonid Logvinov2017-06-011-4/+6
| * | | | Remove TxDataLeonid Logvinov2017-06-011-5/+1
| * | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-011-7/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix linter errorsLeonid Logvinov2017-05-311-1/+1
| * | | | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-311-0/+16
| |\ \ \ \
| * | | | | Remove spaces in typesLeonid Logvinov2017-05-301-4/+0
| * | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-301-0/+20
| |\ \ \ \ \
| * | | | | | Fix order typeLeonid Logvinov2017-05-301-1/+0
| * | | | | | Add Order and SignedOrder typesLeonid Logvinov2017-05-301-0/+23
| * | | | | | Add initial implementation of fillOrderAsyncLeonid Logvinov2017-05-301-0/+33
* | | | | | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapperFabio Berger2017-06-021-1/+5
| |_|_|_|/ / |/| | | | |
* | | | | | Fix tslint issuesFabio Berger2017-06-021-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' into erc20transferLeonid2017-05-311-7/+8
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Add TxOpts typeFabio Berger2017-05-311-1/+6
| * | | remove InternalError type since this error could surface through the public i...Fabio Berger2017-05-311-5/+1
* | | | Add transfer function and tests for itLeonid Logvinov2017-05-311-0/+1
|/ / /
* | | Implement setProxyAllowanceAsyncFabio Berger2017-05-301-0/+1
* | | Implement zeroEx.token.getProxyAllowanceAsyncFabio Berger2017-05-301-0/+8
* | | rename ERC20Contract to TokenContractFabio Berger2017-05-301-1/+1
* | | Merge branch 'master' into erc20WrapperFabio Berger2017-05-301-2/+9
|\ \ \ | | |/ | |/|
| * | Improve type definitionsFabio Berger2017-05-301-2/+6
| * | Add TokenMetadata typeFabio Berger2017-05-301-0/+3
* | | Implement ERC20Wrapper and it's first method getBalanceAsyncFabio Berger2017-05-301-0/+6
|/ /
* / Add TokenRegistryWrapper and getTokensAsync methodFabio Berger2017-05-301-0/+13
|/
* Port over signOrderHashAsyncFabio Berger2017-05-291-0/+1
* Move files up and remove ts folderLeonid Logvinov2017-05-291-0/+36