Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into chai-setup | Leonid | 2017-06-06 | 2 | -4/+16 |
|\ | |||||
| * | Merge pull request #38 from 0xProject/async-errors | Leonid | 2017-06-06 | 1 | -4/+6 |
| |\ | | | | | | | Add a couple of awaits and returns for async tests | ||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #36 from 0xProject/regression-test-transferFrom | Leonid | 2017-06-06 | 1 | -0/+11 |
| |\ \ | | |/ | |/| | Add regression test for transferFrom bug | ||||
| | * | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -1/+2 |
| | | | |||||
| | * | Add regression test for transferFrom bug | Leonid Logvinov | 2017-06-05 | 1 | -0/+10 |
| |/ | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-06 | 5 | -12/+12 |
| | | |||||
* | | Add chai_setup | Leonid Logvinov | 2017-06-05 | 5 | -17/+22 |
|/ | |||||
* | Upgrade truffle-contract to the version that includes 'at' fix | Leonid Logvinov | 2017-06-05 | 2 | -70/+183 |
| | |||||
* | Merge pull request #33 from 0xProject/greenkeeper/initial | Leonid | 2017-06-03 | 2 | -2/+4 |
|\ | | | | | Update dependencies to enable Greenkeeper 🌴 | ||||
| * | docs(readme): add Greenkeeper badge | greenkeeper[bot] | 2017-06-03 | 1 | -0/+2 |
| | | |||||
| * | chore(package): update dependencies | greenkeeper[bot] | 2017-06-03 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 12 | -573/+218 |
|\ \ | | | | | | | Implement zeroEx.exchange.subscribeAsync | ||||
| * | | Consolidate the ExchangeContract type and flesh out type definition for ↵ | Fabio Berger | 2017-06-03 | 1 | -20/+19 |
| | | | | | | | | | | | | isValidSignature.call | ||||
| * | | Run stopWatching in parallel | Fabio Berger | 2017-06-03 | 1 | -3/+4 |
| | | | |||||
| * | | Be more specific with blockParam valid values | Fabio Berger | 2017-06-03 | 1 | -2/+4 |
| | | | |||||
| * | | remove space | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | |||||
| * | | Update artifacts | Fabio Berger | 2017-06-03 | 6 | -566/+35 |
| | | | |||||
| * | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -10/+10 |
| |\| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # test/exchange_wrapper_test.ts # test/utils/fill_scenarios.ts | ||||
| * | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |\ \ | |||||
| * | | | Revert unintentional artifact changes | Fabio Berger | 2017-06-03 | 6 | -35/+566 |
| | | | | |||||
| * | | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 8 | -150/+378 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * \ \ \ | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 2 | -4/+39 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| * | | | | | Add tests for subscribeAsync, making sure events are caught and that ↵ | Fabio Berger | 2017-06-02 | 1 | -1/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | subscriptions are removed on provider change | ||||
| * | | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 5 | -6/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | if user updates the provider | ||||
| * | | | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 5 | -33/+90 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | | | Update artifacts | Fabio Berger | 2017-06-02 | 6 | -561/+30 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #29 from 0xProject/remainingTokenMethods | Leonid | 2017-06-03 | 6 | -48/+240 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Implement Remaining Token Methods | ||||
| * | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 10 | -18/+171 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | ||||
* | | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelled | Leonid | 2017-06-03 | 8 | -17/+166 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement Unavailable, Filled and Cancelled | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 8 | -155/+375 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 5 | -36/+128 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | | | Simplify tests | Fabio Berger | 2017-06-02 | 1 | -16/+11 |
| | | | | | | | |||||
| * | | | | | | improve comment | Fabio Berger | 2017-06-02 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Add comment about the isString assertion lest the next developer tries to ↵ | Fabio Berger | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | use a stricter assertion (i.e isHexString) which we intentionally did not do | ||||
| * | | | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵ | Fabio Berger | 2017-06-02 | 3 | -11/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and getCanceledTakerAmountAsync | ||||
| * | | | | | | Always wrap BigNumbers returned by web3 with our own version and add comment | Fabio Berger | 2017-06-02 | 2 | -5/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 5 | -44/+82 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 4 | -12/+39 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 18 | -285/+984 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 5 | -43/+274 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵ | Fabio Berger | 2017-06-01 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync | ||||
| * | | | | | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHash | Fabio Berger | 2017-06-01 | 3 | -4/+12 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Use forked version of chai-bignumber while the PR is waiting for a review | Leonid Logvinov | 2017-06-03 | 2 | -1/+5 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| | | | | | | | | * | | Fix bug | Fabio Berger | 2017-06-03 | 2 | -8/+6 |
| | | | | | | | | | | | |||||
| | | | | | | | | * | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | | | | | | | * | | Add missing async suffix | Fabio Berger | 2017-06-03 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| | | | | | | | | * | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 22 | -293/+1366 |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | ||||
* | | | | | | | | | | | Add includeStack config to chai setup so that we get stackTraces | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #30 from 0xProject/fillOrderAsync | Leonid | 2017-06-03 | 20 | -291/+1360 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fillOrderAsync | ||||
| * | | | | | | | | | | Fix undefined web3 issue | Fabio Berger | 2017-06-03 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix linter errors | Leonid Logvinov | 2017-06-03 | 1 | -4/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -3/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 5 | -95/+100 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -10/+10 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix test name | Leonid Logvinov | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 2 | -6/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Remove spaces | Leonid Logvinov | 2017-06-03 | 1 | -3/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 3 | -28/+28 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Allign arguments | Leonid Logvinov | 2017-06-03 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Rewrite comment | Leonid Logvinov | 2017-06-03 | 1 | -5/+11 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 3 | -35/+28 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Assign wouldRoundingErrorOccur to a variable | Leonid Logvinov | 2017-06-02 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 3 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Assign timestamp to a variable | Leonid Logvinov | 2017-06-02 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 3 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't pass zrxTokenAsign | Leonid Logvinov | 2017-06-02 | 1 | -6/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Rename validation functions | Leonid Logvinov | 2017-06-02 | 1 | -8/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add getZRXTokenAddressAsync | Leonid Logvinov | 2017-06-02 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix ordering | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 3 | -37/+37 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Improve fillOrderAsync comment | Fabio Berger | 2017-06-02 | 1 | -3/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-02 | 1 | -321/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Remove protocol token artifacts | Leonid Logvinov | 2017-06-02 | 1 | -321/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 2 | -8/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Improve comment | Fabio Berger | 2017-06-02 | 1 | -2/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | remove ProtocolToken | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Rename coinBase to coinbase | Leonid Logvinov | 2017-06-02 | 2 | -12/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | 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 | 3 | -10/+96 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add success test for fill with fees | Leonid Logvinov | 2017-06-02 | 2 | -5/+33 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add token utils | Leonid Logvinov | 2017-06-02 | 1 | -0/+23 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add ProtocolTokenArtifacts | Leonid Logvinov | 2017-06-02 | 2 | -1/+322 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add fill scenario with fees | Leonid Logvinov | 2017-06-02 | 2 | -10/+41 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 4 | -18/+61 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 2 | -4/+39 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-02 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add test for valid partial fill | Leonid Logvinov | 2017-06-02 | 1 | -0/+17 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵ | Fabio Berger | 2017-06-02 | 3 | -6/+7 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined if non available | ||||
| * | | | | | | | | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 2 | -15/+35 |
| | | | | | | | | | |||||
| * | | | | | | | | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 4 | -16/+38 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test | ||||
| * | | | | | | | Fix tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Work | Leonid Logvinov | 2017-06-02 | 2 | -15/+30 |
| | | | | | | | | |||||
| * | | | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 5 | -42/+67 |
| | | | | | | | | |||||
| * | | | | | | | Change test name | Leonid Logvinov | 2017-06-02 | 1 | -3/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 2 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 4 | -11/+37 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Revert "Add test to check the balance" | Leonid Logvinov | 2017-06-02 | 1 | -10/+0 |
| | |_|/ / | |/| | | | | | | | | | | | | | This reverts commit 389c18e98e2b5663b1732d7c34f9b21afef66e44. | ||||
| * | | | | Add test to check the balance | Leonid Logvinov | 2017-06-01 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | rename variable | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Follow constants convention | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix getOrderHashAsync test | Fabio Berger | 2017-06-01 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Fix import | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove unused arg | Fabio Berger | 2017-06-01 | 2 | -7/+4 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -15/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | * | | | | | Remove duplicate declarations | Leonid Logvinov | 2017-06-01 | 1 | -15/+3 |
| | | | | | | | |||||
| * | | | | | | Add missing comma and semi-colon | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵ | Fabio Berger | 2017-06-01 | 3 | -52/+64 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | artifacts | ||||
| * | | | | | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| | * | | | | 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 |
| | | | | | | |||||
| * | | | | | remove comment | Fabio Berger | 2017-06-01 | 1 | -1/+0 |
| |/ / / / | |||||
| * | | | | rename txData to txOpts | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | remove superfluous param | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove unused arg | Fabio Berger | 2017-06-01 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | remove unneeded method | Fabio Berger | 2017-06-01 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | improve comment | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 4 | -4/+12 |
| |\ \ \ \ | |||||
| | * | | | | Add timestamp parameter to order factory | Leonid Logvinov | 2017-06-01 | 1 | -3/+7 |
| | | | | | | |||||
| | * | | | | Add expired check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Add EXPIRED error type | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Increase mocha timeout | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add comment for fillOrderAsync method, rename fillAmount to ↵ | Fabio Berger | 2017-06-01 | 2 | -9/+15 |
| |/ / / / | | | | | | | | | | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer | ||||
| * | | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 5 | -34/+20 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c. | ||||
| * | | | | Get getSenderAddressOrThrowAsync everywhere where we throw if the ↵ | Fabio Berger | 2017-06-01 | 2 | -15/+12 |
| | | | | | | | | | | | | | | | | | | | | senderAddress doesn't exist | ||||
| * | | | | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 2 | -8/+17 |
| | | | | | |||||
| * | | | | 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 | 6 | -28/+63 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| | * | | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 5 | -21/+35 |
| | | | | | | |||||
| | * | | | | Fix tests | Leonid Logvinov | 2017-06-01 | 1 | -8/+2 |
| | | | | | | |||||
| | * | | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 3 | -1/+14 |
| | | | | | | |||||
| | * | | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 3 | -2/+16 |
| | | | | | | |||||
| * | | | | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 2 | -10/+10 |
| |/ / / / | |||||
| * | | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 4 | -7/+6 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 2 | -9/+7 |
| |\ \ \ \ | |||||
| | * | | | | Add taker parameter to createSignedOrder | Leonid Logvinov | 2017-06-01 | 2 | -3/+6 |
| | | | | | | |||||
| | * | | | | Rename order to order_factory | Leonid Logvinov | 2017-06-01 | 2 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove unnecessary checks | Leonid Logvinov | 2017-06-01 | 1 | -5/+0 |
| | | | | | | |||||
| * | | | | | rename signed_order_schema to order_schemas | Fabio Berger | 2017-06-01 | 4 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 4 | -46/+365 |
| |\ \ \ \ | |||||
| | * | | | | Fix types hell with, chai and chai-as-promised | Leonid Logvinov | 2017-06-01 | 4 | -46/+365 |
| | | | | | | |||||
| * | | | | | Add convertToJSONSchemaCompatibleObject method | Fabio Berger | 2017-06-01 | 3 | -2/+15 |
| | | | | | | |||||
| * | | | | | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | make bigNumberConfig a module | Fabio Berger | 2017-06-01 | 2 | -9/+13 |
| | | | | | |||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-06-01 | 3 | -22/+28 |
| | | | | | |||||
| * | | | | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 4 | -26/+16 |
| | | | | | |||||
| * | | | | Type estimateGas | Leonid Logvinov | 2017-06-01 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Allign parameters | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Remove TxData | Leonid Logvinov | 2017-06-01 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Temporarily fix gas extimation | Leonid Logvinov | 2017-06-01 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Use const | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 3 | -2/+12 |
| | | | | | |||||
| * | | | | Temp push | Leonid Logvinov | 2017-06-01 | 2 | -55/+58 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 5 | -43/+4064 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Add setAllowance function | Leonid Logvinov | 2017-05-31 | 1 | -4/+18 |
| | | | | | |||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 4 | -5/+5 |
| | | | | | |||||
| * | | | | Remove debug output | Leonid Logvinov | 2017-05-31 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Revert tests | Leonid Logvinov | 2017-05-31 | 1 | -7/+43 |
| | | | | | |||||
| * | | | | Add createSignedOrder function | Leonid Logvinov | 2017-05-31 | 1 | -6/+23 |
| | | | | | |||||
| * | | | | Don't return contract response | Leonid Logvinov | 2017-05-31 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Set bignumber config | Leonid Logvinov | 2017-05-31 | 2 | -0/+11 |
| | | | | | |||||
| * | | | | Fix linter command | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 6 | -2/+242 |
| |\ \ \ \ | |||||
| * | | | | | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 5 | -78/+61 |
| | | | | | | |||||
| * | | | | | Remove spaces in types | Leonid Logvinov | 2017-05-30 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Remove fixture | Leonid Logvinov | 2017-05-30 | 1 | -35/+0 |
| | | | | | | |||||
| * | | | | | Add first passing test | Leonid Logvinov | 2017-05-30 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | Add isBigNumber argument assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | replace test fixture with the one from testrpc | Leonid Logvinov | 2017-05-30 | 2 | -35/+35 |
| | | | | | | |||||
| * | | | | | Fix import | Leonid Logvinov | 2017-05-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 10 | -13/+191 |
| |\ \ \ \ \ | |||||
| * | | | | | | Temporarily remove test | Leonid Logvinov | 2017-05-30 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Add throwErrorLogsAsErrors | Leonid Logvinov | 2017-05-30 | 1 | -6/+10 |
| | | | | | | | |||||
| * | | | | | | Append _test to exchange_wrapper | Leonid Logvinov | 2017-05-30 | 1 | -1/+11 |
| | | | | | | | |||||
| * | | | | | | Add order utils | Leonid Logvinov | 2017-05-30 | 1 | -0/+21 |
| | | | | | | | |||||
| * | | | | | | Fix order type | Leonid Logvinov | 2017-05-30 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Fix orderSchema | Leonid Logvinov | 2017-05-30 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Add fillAmount parameter | Leonid Logvinov | 2017-05-30 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Add copy_fixtures command | Leonid Logvinov | 2017-05-30 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of params | Leonid Logvinov | 2017-05-30 | 1 | -35/+21 |
| | | | | | | | |||||
| * | | | | | | Change BigNumber schema to Number schema | Leonid Logvinov | 2017-05-30 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Change BigNumber schema to Number schema | Leonid Logvinov | 2017-05-30 | 1 | -11/+10 |
| | | | | | | | |||||
| * | | | | | | Add id to signedOrderSchema | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add first order fixture | Leonid Logvinov | 2017-05-30 | 1 | -0/+35 |
| | | | | | | | |||||
| * | | | | | | Add isBoolean assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Add signedOrderSchema and all subschemas | Leonid Logvinov | 2017-05-30 | 2 | -1/+56 |
| | | | | | | | |||||
| * | | | | | | Add Order and SignedOrder types | Leonid Logvinov | 2017-05-30 | 1 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 3 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Finish ecSignature renaming | Leonid Logvinov | 2017-05-30 | 2 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Add assertions for parameters | Leonid Logvinov | 2017-05-30 | 1 | -1/+15 |
| | | | | | | | | |||||
| * | | | | | | | Move field declaration to the begining of the class | Leonid Logvinov | 2017-05-30 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | Add initial implementation of fillOrderAsync | Leonid Logvinov | 2017-05-30 | 2 | -1/+96 |
| | | | | | | | | |||||
| * | | | | | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsync | Leonid Logvinov | 2017-05-30 | 2 | -6/+14 |
| | | | | | | | | |||||
| * | | | | | | | Add tests to linter targets | Leonid Logvinov | 2017-05-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use npm run testrpc on circlecCI | Leonid Logvinov | 2017-05-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | | | | * | remove unneeded calls to toBaseUnitAmount | Fabio Berger | 2017-06-02 | 1 | -8/+4 |
| | | | | | | | | |||||
| | | | | | | * | pass numbers to BigNumber unless it's too big for the number type | Fabio Berger | 2017-06-02 | 1 | -4/+4 |
| | | | | | | | | |||||
| | | | | | | * | use BigNumber(0) instead of with a string zero | Fabio Berger | 2017-06-02 | 1 | -4/+4 |
| | | | | | | | | |||||
| | | | | | | * | Add balance check to `transferAsync` and related test | Fabio Berger | 2017-06-02 | 2 | -3/+20 |
| | | | | | | | | |||||
| | | | | | | * | Improve comment | Fabio Berger | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | |||||
| | | | | | | * | Add tests for transferFromAsync, setAllowanceAsync and getAllowanceAsync and ↵ | Fabio Berger | 2017-06-02 | 1 | -21/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix up other test issues | ||||
| | | | | | | * | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper | Fabio Berger | 2017-06-02 | 5 | -18/+93 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Fix tslint issues | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #28 from 0xProject/erc20transfer | Leonid | 2017-06-01 | 3 | -23/+60 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add transfer function and tests for it | ||||
| * | | | | | | Address feedback | Leonid Logvinov | 2017-05-31 | 1 | -26/+28 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 3 | -15/+3840 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 3 | -1/+36 |
| | | | | | | |||||
* | | | | | | Fix testrpc verison to 3.0.5 | Leonid Logvinov | 2017-06-01 | 2 | -20/+214 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #26 from 0xProject/erc20Wrapper | Fabio Berger | 2017-05-31 | 6 | -2/+206 |
|\ \ \ \ \ | | | | | | | | | | | | | Implement TokenWrapper functions & tests | ||||
| * | | | | | Add TxOpts type | Fabio Berger | 2017-05-31 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | remove InternalError type since this error could surface through the public ↵ | Fabio Berger | 2017-05-31 | 2 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | interface | ||||
| * | | | | | Remove superfluous undefined check | Fabio Berger | 2017-05-31 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | Add full stop to comments | Fabio Berger | 2017-05-31 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | remove unused imports | Fabio Berger | 2017-05-30 | 2 | -4/+0 |
| | | | | | |||||
| * | | | | Add test for setProxyAllowanceAsync and additional test for ↵ | Fabio Berger | 2017-05-30 | 1 | -2/+32 |
| | | | | | | | | | | | | | | | | | | | | getProxyAllowanceAsync | ||||
| * | | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 3 | -4/+34 |
| | | | | | |||||
| * | | | | remove spaces after it keyword | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add first test for getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 2 | -1/+34 |
| | | | | | |||||
| * | | | | use token instead of erc20 | Fabio Berger | 2017-05-30 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up ↵ | Fabio Berger | 2017-05-30 | 3 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | supporting another spec | ||||
| * | | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 8 | -23/+85 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| * | | | | Merge branch 'tokenRegistry' into erc20Wrapper | Fabio Berger | 2017-05-30 | 2 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | Add tests for getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+55 |
| | | | | | | |||||
| * | | | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 3 | -0/+37 |
| | | | | | | |||||
* | | | | | | Merge pull request #27 from 0xProject/yarn | Fabio Berger | 2017-05-31 | 1 | -0/+3826 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add yarn.lock | ||||
| * | | | | | Add yarn.lock | Leonid Logvinov | 2017-05-31 | 1 | -0/+3826 |
|/ / / / / | |||||
* | | | | | Remove mention of internal cleanup from public comment | Fabio Berger | 2017-05-30 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Merge pull request #25 from 0xProject/dontReinstantiateContractInstances | Leonid | 2017-05-30 | 7 | -9/+74 |
|\ \ \ \ \ | | | | | | | | | | | | | Add zeroEx.setProvider and clear contractInstances created with old provider | ||||
| * | | | | | use .be.undefined instead of .be.an('undefined') | Fabio Berger | 2017-05-30 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter ↵ | Fabio Berger | 2017-05-30 | 3 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | that instantiates contract instance if not already instantiated |