Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 2 | -5/+87 |
|\ | |||||
| * | remove space | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 2 | -9/+5 |
| |\ | |||||
| * \ | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -98/+252 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 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 |
| * | | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ... | Fabio Berger | 2017-06-02 | 1 | -3/+3 |
| * | | | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 2 | -29/+80 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 2 | -8/+96 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelled | Leonid | 2017-06-03 | 2 | -8/+96 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 4 | -99/+249 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 2 | -29/+105 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | * | | | | Simplify tests | Fabio Berger | 2017-06-02 | 1 | -16/+11 |
| | * | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and... | Fabio Berger | 2017-06-02 | 2 | -8/+97 |
* | | | | | | Fix bug | Fabio Berger | 2017-06-03 | 1 | -7/+5 |
* | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 9 | -145/+536 |
|\| | | | | | |||||
| * | | | | | Add includeStack config to chai setup so that we get stackTraces | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | 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 | 3 | -36/+34 |
| |\ \ \ \ | |||||
| | * | | | | 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 | 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 | 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 | 1 | -1/+44 |
| * | | | | 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 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 | 2 | -18/+40 |
| | |/ / | |/| | | |||||
| * | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -0/+25 |
| | |/ | |/| | |||||
| * | | 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 | 1 | -2/+2 |
| |/ / | |||||
| * | | 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 | 2 | -16/+29 |
| |/ | |||||
| * | 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 | 2 | -37/+56 |
| * | 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 |
| * | 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 |
| * | 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 ar... | Fabio Berger | 2017-06-01 | 2 | -24/+23 |
| | |/ | |/| | |||||
| * | | 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 |
| |\ | |||||
| | * | 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 |
| |/ | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -3/+7 |
| |\ | |||||
| | * | Add timestamp parameter to order factory | Leonid Logvinov | 2017-06-01 | 1 | -3/+7 |
| * | | 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 | 2 | -29/+19 |
| * | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 2 | -19/+29 |
| * | Fix tests | Leonid Logvinov | 2017-06-01 | 1 | -8/+2 |
| * | 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 | 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 |
| * | Fix linter errors | Leonid Logvinov | 2017-06-01 | 2 | -22/+24 |
| * | 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 | 2 | -55/+58 |
| * | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -26/+28 |
| |\ | |||||
| * | | Add setAllowance function | Leonid Logvinov | 2017-05-31 | 1 | -4/+18 |
| * | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
| * | | 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 |
| * | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 2 | -2/+111 |
| |\ \ | |||||
| * | | | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 3 | -46/+43 |
| * | | | Remove fixture | Leonid Logvinov | 2017-05-30 | 1 | -35/+0 |
| * | | | Add first passing test | Leonid Logvinov | 2017-05-30 | 1 | -4/+5 |
| * | | | 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 | 3 | -7/+82 |
| |\ \ \ | |||||
| * | | | | Temporarily remove test | Leonid Logvinov | 2017-05-30 | 1 | -2/+1 |
| * | | | | Append _test to exchange_wrapper | Leonid Logvinov | 2017-05-30 | 1 | -1/+11 |
| * | | | | Add order utils | Leonid Logvinov | 2017-05-30 | 1 | -0/+21 |
| * | | | | Add first order fixture | Leonid Logvinov | 2017-05-30 | 1 | -0/+35 |
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -0/+0 |
| |\ \ \ \ | |||||
| * | | | | | Finish ecSignature renaming | 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 | 1 | -3/+14 |
* | | | | | | Add tests for transferFromAsync, setAllowanceAsync and getAllowanceAsync and ... | Fabio Berger | 2017-06-02 | 1 | -21/+125 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Address feedback | Leonid Logvinov | 2017-05-31 | 1 | -26/+28 |
| |_|_|/ |/| | | | |||||
* | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 1 | -0/+19 |
* | | | | remove unused imports | Fabio Berger | 2017-05-30 | 2 | -4/+0 |
* | | | | Add test for setProxyAllowanceAsync and additional test for getProxyAllowance... | Fabio Berger | 2017-05-30 | 1 | -2/+32 |
* | | | | 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 |
* | | | | use token instead of erc20 | Fabio Berger | 2017-05-30 | 1 | -3/+3 |
* | | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up supp... | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
* | | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 4 | -10/+41 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | use .be.undefined instead of .be.an('undefined') | Fabio Berger | 2017-05-30 | 1 | -4/+4 |
| * | | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that... | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| * | | | Also test that web3Wrapper nested under tokenRegistryWrapper has updated prov... | Fabio Berger | 2017-05-30 | 1 | -2/+4 |
| * | | | add assertions that contractInstances are not undefined before provider update | Fabio Berger | 2017-05-30 | 1 | -0/+2 |
| * | | | Also instantiate tokenRegistry contract instance | Fabio Berger | 2017-05-30 | 1 | -1/+2 |
| * | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+0 |
| * | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+0 |
| * | | | Make tokenRegistry contract instantiation lazy and clear it on provider update | Fabio Berger | 2017-05-30 | 1 | -1/+2 |
| * | | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 1 | -0/+43 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into tokenRegistry | Fabio Berger | 2017-05-30 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | * | | | | use to.have.lengthOf | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| * | | | | | Add tests for setProvider | Fabio Berger | 2017-05-30 | 2 | -3/+30 |
| | |/ / / | |/| | | | |||||
| * | | | | make web3Wrapper a private instance variable | Fabio Berger | 2017-05-30 | 1 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'tokenRegistry' into erc20Wrapper | Fabio Berger | 2017-05-30 | 1 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistry | Fabio Berger | 2017-05-30 | 1 | -0/+0 |
| |\| | | |||||
| | * | | name exchangeWrapper test file properly | Fabio Berger | 2017-05-30 | 1 | -0/+0 |
| | |/ | |||||
* | / | Add tests for getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+55 |
|/ / | |||||
* / | Add tests for getTokensAsync including schema validation | Fabio Berger | 2017-05-30 | 1 | -0/+43 |
|/ | |||||
* | Fix typos | Fabio Berger | 2017-05-29 | 1 | -2/+2 |
* | empty stubs array before next test runs | Fabio Berger | 2017-05-29 | 1 | -0/+1 |
* | Merge branch 'master' into addSignOrderHashAndTests | Fabio Berger | 2017-05-29 | 2 | -15/+12 |
|\ | |||||
| * | Merge pull request #16 from 0xProject/umd-tests | Fabio Berger | 2017-05-29 | 2 | -15/+12 |
| |\ | |||||
| | * | Use only 0x public interface in contract wrapper tests | Leonid Logvinov | 2017-05-29 | 1 | -14/+11 |
| | * | Use constants from test utils | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 |
* | | | Use disable-next-line instead of disable and always put rule that is being di... | Fabio Berger | 2017-05-29 | 1 | -4/+2 |
* | | | Implement tests for signOrderHashAsync that test the logic for Parity < v1.6.... | Fabio Berger | 2017-05-29 | 1 | -0/+72 |
|/ / | |||||
* / | don't use uppercase for constant variable unless it's global to the entire file | Fabio Berger | 2017-05-29 | 1 | -3/+3 |
|/ | |||||
* | Fix imports | Leonid Logvinov | 2017-05-29 | 2 | -4/+4 |
* | Merge branch 'master' of github.com:0xProject/0x.js | Fabio Berger | 2017-05-29 | 6 | -2/+197 |
|\ | |||||
| * | improve comment | Fabio Berger | 2017-05-27 | 1 | -1/+2 |
| * | rename BlockClean to BlockchainLifecycle and setupAsync to startAsync, restor... | Fabio Berger | 2017-05-27 | 2 | -7/+7 |
| * | import reorder | Fabio Berger | 2017-05-26 | 1 | -1/+1 |
| * | remove stray console log | Fabio Berger | 2017-05-26 | 1 | -1/+0 |
| * | Add missing return types | Fabio Berger | 2017-05-26 | 2 | -4/+4 |
| * | Setup blockchain snapshotting before/after every test, implemented unit tests... | Fabio Berger | 2017-05-26 | 5 | -0/+194 |
| * | Postfix test files with `_test` | Fabio Berger | 2017-05-26 | 1 | -0/+0 |
|/ | |||||
* | Address feedback | Leonid Logvinov | 2017-05-26 | 1 | -4/+5 |
* | Port getOrderHash | Leonid Logvinov | 2017-05-25 | 1 | -0/+37 |
* | Fix braces | Leonid Logvinov | 2017-05-25 | 1 | -0/+2 |
* | Merge branch 'master' into isValidOrderHash | Leonid | 2017-05-25 | 1 | -1/+22 |
|\ | |||||
| * | Add toUnitAmount and toBaseUnitAmount static helpers and tests | Fabio Berger | 2017-05-25 | 1 | -1/+24 |
* | | Address feedback | Leonid Logvinov | 2017-05-25 | 1 | -1/+5 |
* | | Merge branch 'master' into isValidOrderHash | Leonid | 2017-05-25 | 1 | -10/+6 |
|\| | |||||
| * | Use expect.to.throw | Fabio Berger | 2017-05-25 | 1 | -24/+4 |
| * | Merge branch 'master' into addSchemas | Fabio Berger | 2017-05-25 | 1 | -0/+13 |
| |\ | |||||
| * | | remove stray console log | Fabio Berger | 2017-05-25 | 1 | -1/+0 |
| * | | Fix malformed tests to check for thrown assertion | Fabio Berger | 2017-05-25 | 1 | -10/+27 |
* | | | Fix tests | Leonid Logvinov | 2017-05-25 | 1 | -1/+1 |
* | | | Port isValidOrderHash and tests | Leonid Logvinov | 2017-05-25 | 1 | -0/+10 |
| |/ |/| | |||||
* | | Add generateSalt and tests for it | Leonid Logvinov | 2017-05-25 | 1 | -0/+13 |
|/ | |||||
* | Fix test that was passing an invalid address (now caught by our assertions), ... | Fabio Berger | 2017-05-25 | 1 | -1/+2 |
* | Address feedback | Leonid Logvinov | 2017-05-25 | 1 | -1/+2 |
* | Add test for malformed s | Leonid Logvinov | 2017-05-25 | 1 | -0/+10 |
* | change tests descriptions | Leonid Logvinov | 2017-05-25 | 1 | -15/+24 |
* | Add test vector source | Leonid Logvinov | 2017-05-25 | 1 | -0/+1 |
* | Add isSignatureValid method and tests for it | Leonid Logvinov | 2017-05-25 | 1 | -4/+46 |
* | Remove spaces | Leonid Logvinov | 2017-05-24 | 1 | -1/+1 |
* | Add initial testing config and a dummy test | Leonid Logvinov | 2017-05-24 | 1 | -0/+12 |