Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 1 | -0/+11 |
|\ | |||||
| * | Fix names in types | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| * | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 1 | -1/+8 |
| |\ | |||||
| * \ | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
| |\ \ | |||||
| * | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
| |\| | | |||||
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
| * | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 1 | -3/+0 |
| * | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
* | | | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -0/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 1 | -1/+7 |
| |\ \ \ | |||||
| * | | | | Fix linter error | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| * | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
* | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 1 | -0/+11 |
| |/ / |/| | | |||||
* | | | make txOpts optional | Fabio Berger | 2017-06-07 | 1 | -2/+2 |
* | | | remove space | Fabio Berger | 2017-06-07 | 1 | -1/+0 |
* | | | merge master | Fabio Berger | 2017-06-07 | 1 | -5/+17 |
|\| | | |||||
| * | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 1 | -3/+0 |
| |/ | |||||
| * | Make txOpts optional | Leonid Logvinov | 2017-06-07 | 1 | -7/+7 |
| * | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -3/+6 |
| * | Add missing semicolon | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 1 | -0/+4 |
| * | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -0/+2 |
| * | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 1 | -0/+6 |
* | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -4/+11 |
|/ | |||||
* | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 1 | -2/+2 |
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -4/+50 |
|\ | |||||
| * | Consolidate the ExchangeContract type and flesh out type definition for isVal... | Fabio Berger | 2017-06-03 | 1 | -20/+19 |
| * | Be more specific with blockParam valid values | Fabio Berger | 2017-06-03 | 1 | -2/+4 |
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -19/+26 |
| |\ | |||||
| * | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ... | Fabio Berger | 2017-06-02 | 1 | -0/+41 |
* | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -0/+9 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 1 | -23/+26 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| * | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -2/+64 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa... | Fabio Berger | 2017-06-01 | 1 | -0/+9 |
* | | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -7/+80 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 1 | -5/+6 |
| * | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| * | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 1 | -9/+3 |
| * | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| * | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| * | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
| * | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 1 | -3/+3 |
| * | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 1 | -0/+7 |
| * | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 1 | -0/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
| * | | | | rename txData to txOpts | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| * | | | | Add EXPIRED error type | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| * | | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 1 | -1/+0 |
| * | | | | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 1 | -0/+8 |
| * | | | | fix formatting | Fabio Berger | 2017-06-01 | 1 | -4/+2 |
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -1/+8 |
| |\ \ \ \ | |||||
| | * | | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 1 | -1/+2 |
| | * | | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | * | | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -0/+5 |
| * | | | | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| * | | | | Type estimateGas | Leonid Logvinov | 2017-06-01 | 1 | -4/+6 |
| * | | | | Remove TxData | Leonid Logvinov | 2017-06-01 | 1 | -5/+1 |
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -7/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
| * | | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| * | | | | | Remove spaces in types | Leonid Logvinov | 2017-05-30 | 1 | -4/+0 |
| * | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -0/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix order type | Leonid Logvinov | 2017-05-30 | 1 | -1/+0 |
| * | | | | | | Add Order and SignedOrder types | Leonid Logvinov | 2017-05-30 | 1 | -0/+23 |
| * | | | | | | Add initial implementation of fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -0/+33 |
* | | | | | | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper | Fabio Berger | 2017-06-02 | 1 | -1/+5 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Fix tslint issues | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 1 | -7/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Add TxOpts type | Fabio Berger | 2017-05-31 | 1 | -1/+6 |
| * | | | remove InternalError type since this error could surface through the public i... | Fabio Berger | 2017-05-31 | 1 | -5/+1 |
* | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 1 | -0/+1 |
|/ / / | |||||
* | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+1 |
* | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+8 |
* | | | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
* | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 1 | -2/+9 |
|\ \ \ | | |/ | |/| | |||||
| * | | Improve type definitions | Fabio Berger | 2017-05-30 | 1 | -2/+6 |
| * | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 1 | -0/+3 |
* | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+6 |
|/ / | |||||
* / | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 1 | -0/+13 |
|/ | |||||
* | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 1 | -0/+1 |
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 1 | -0/+36 |