Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 1 | -0/+22 |
|\ | |||||
| * | Add getOrderHashHexUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+22 |
* | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -3/+3 |
* | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 1 | -6/+78 |
|\| | |||||
| * | Format inputs | Leonid Logvinov | 2017-06-08 | 1 | -1/+2 |
| * | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 1 | -1/+99 |
| |\ | |||||
| | * | Fix tests with removed shouldCheckTransfer | Fabio Berger | 2017-06-07 | 1 | -6/+3 |
| | * | merge master | Fabio Berger | 2017-06-07 | 1 | -2/+51 |
| | |\ | |||||
| | * | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -1/+102 |
| * | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -8/+4 |
* | | | | Add no-op test | Leonid Logvinov | 2017-06-08 | 1 | -3/+3 |
* | | | | Add success test | Leonid Logvinov | 2017-06-08 | 1 | -3/+27 |
* | | | | Remove only | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
* | | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -12/+22 |
|\| | | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -11/+21 |
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -23/+65 |
| | |/ | |/| | |||||
| * | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
* | | | Move fillableAmount to initialization section | Leonid Logvinov | 2017-06-07 | 1 | -8/+17 |
* | | | Move initialization up | Leonid Logvinov | 2017-06-07 | 1 | -15/+15 |
* | | | Move fillOrderAsync to fill order describe block | Leonid Logvinov | 2017-06-07 | 1 | -179/+185 |
* | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -23/+65 |
* | | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
|/ / | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
* | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
* | | Remove only | 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/+5 |
* | | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -1/+17 |
* | | Merge branch 'master' into cancelAsync | Leonid Logvinov | 2017-06-06 | 1 | -1/+2 |
|\| | |||||
| * | Pass nonExistentSenderAddress so that we get the proper rejection | Fabio Berger | 2017-06-06 | 1 | -1/+2 |
* | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 1 | -1/+29 |
|/ | |||||
* | Merge pull request #39 from 0xProject/senderAccount | Leonid | 2017-06-06 | 1 | -33/+21 |
|\ | |||||
| * | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 1 | -33/+21 |
* | | Merge branch 'master' into chai-setup | Leonid | 2017-06-06 | 1 | -4/+5 |
|\ \ | |||||
| * | | Add chai-as-promised | Leonid Logvinov | 2017-06-05 | 1 | -0/+2 |
| * | | Add a couple of awaits and returns for async tests | Leonid Logvinov | 2017-06-05 | 1 | -4/+4 |
| |/ | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -2/+2 |
* | | Add chai_setup | Leonid Logvinov | 2017-06-05 | 1 | -5/+2 |
|/ | |||||
* | remove space | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
* | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #31 from 0xProject/unavailableFilledCancelled | Leonid | 2017-06-03 | 1 | -8/+78 |
| |\ | |||||
| | * | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 1 | -67/+143 |
| | |\ | |||||
| | * \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -24/+94 |
| | |\ \ | |||||
* | | | | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | Add includeStack config to chai setup so that we get stackTraces | Fabio Berger | 2017-06-03 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -70/+146 |
|\| | | | |||||
| * | | | Fix undefined web3 issue | Fabio Berger | 2017-06-03 | 1 | -2/+2 |
| * | | | Fix linter errors | Leonid Logvinov | 2017-06-03 | 1 | -4/+12 |
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 1 | -30/+28 |
| |\ \ \ | |||||
| | * | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | * | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -5/+5 |
| | * | | | Fix test name | Leonid Logvinov | 2017-06-03 | 1 | -1/+1 |
| | * | | | Remove spaces | Leonid Logvinov | 2017-06-03 | 1 | -3/+1 |
| | * | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | * | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 1 | -13/+13 |
| | * | | | 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 |
| * | | | | Fix ordering | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 1 | -21/+21 |
| * | | | Rename coinBase to coinbase | Leonid Logvinov | 2017-06-02 | 1 | -6/+6 |
| * | | | Refactor balance & allowance tests | Leonid Logvinov | 2017-06-02 | 1 | -47/+42 |
| * | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 1 | -1/+44 |
| * | | | Add success test for fill with fees | Leonid Logvinov | 2017-06-02 | 1 | -4/+21 |
| * | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 1 | -9/+22 |
| | |/ | |/| | |||||
* | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -0/+25 |
|\| | | |||||
| * | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -0/+25 |
* | | | Add tests for subscribeAsync, making sure events are caught and that subscrip... | Fabio Berger | 2017-06-02 | 1 | -1/+83 |
* | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -24/+69 |
|\| | | |/ |/| | |||||
| * | Add test for valid partial fill | Leonid Logvinov | 2017-06-02 | 1 | -0/+17 |
| * | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -15/+32 |
| * | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 1 | -13/+20 |
* | | Simplify tests | Fabio Berger | 2017-06-02 | 1 | -16/+11 |
* | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and... | Fabio Berger | 2017-06-02 | 1 | -8/+77 |
|/ | |||||
* | Fix tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
* | Work | Leonid Logvinov | 2017-06-02 | 1 | -9/+24 |
* | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -37/+27 |
* | Change test name | Leonid Logvinov | 2017-06-02 | 1 | -3/+2 |
* | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -1/+2 |
* | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -7/+17 |
* | Revert "Add test to check the balance" | Leonid Logvinov | 2017-06-02 | 1 | -10/+0 |
* | Add test to check the balance | Leonid Logvinov | 2017-06-01 | 1 | -0/+10 |
* | Follow constants convention | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
* | remove unused arg | Fabio Berger | 2017-06-01 | 1 | -6/+4 |
* | Remove duplicate declarations | Leonid Logvinov | 2017-06-01 | 1 | -15/+3 |
* | get rid of literal amount params | Fabio Berger | 2017-06-01 | 1 | -6/+16 |
* | remove duplicate declarations | Fabio Berger | 2017-06-01 | 1 | -3/+0 |
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -8/+18 |
|\ | |||||
| * | give some balance and allowance by default | Leonid Logvinov | 2017-06-01 | 1 | -5/+4 |
| * | Add test, for throw when order is expired | Leonid Logvinov | 2017-06-01 | 1 | -3/+14 |
* | | Add async suffix and fix alignment | Fabio Berger | 2017-06-01 | 1 | -9/+9 |
|/ | |||||
* | reorder variabled | Fabio Berger | 2017-06-01 | 1 | -3/+3 |
* | remove legacy code | Fabio Berger | 2017-06-01 | 1 | -1/+0 |
* | reorder import | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -9/+10 |
|\ | |||||
| * | Add shouldCheckTransfer | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
| * | Refactor tests | Leonid Logvinov | 2017-06-01 | 1 | -10/+11 |
* | | put external imports at the top | Fabio Berger | 2017-06-01 | 1 | -6/+6 |
|/ | |||||
* | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn... | Fabio Berger | 2017-06-01 | 1 | -3/+4 |
* | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 1 | -22/+16 |
* | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 1 | -16/+22 |
* | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -1/+10 |
* | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
* | Add taker parameter to createSignedOrder | Leonid Logvinov | 2017-06-01 | 1 | -2/+4 |
* | Rename order to order_factory | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
* | Remove unnecessary checks | Leonid Logvinov | 2017-06-01 | 1 | -5/+0 |
* | Fix linter errors | Leonid Logvinov | 2017-06-01 | 1 | -8/+8 |
* | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 1 | -0/+4 |
* | Allign parameters | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
* | Use const | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
* | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
* | Temp push | Leonid Logvinov | 2017-06-01 | 1 | -21/+28 |
* | Add setAllowance function | Leonid Logvinov | 2017-05-31 | 1 | -4/+18 |
* | Fix linter errors | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
* | Revert tests | Leonid Logvinov | 2017-05-31 | 1 | -7/+43 |
* | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -2/+0 |
* | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 1 | -4/+3 |
* | Add first passing test | Leonid Logvinov | 2017-05-30 | 1 | -4/+5 |
* | Temporarily remove test | Leonid Logvinov | 2017-05-30 | 1 | -2/+1 |
* | Append _test to exchange_wrapper | Leonid Logvinov | 2017-05-30 | 1 | -0/+105 |