Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fix indentation | Fabio Berger | 2017-06-09 | 1 | -13/+13 | |
* | | add comment explaining the use of any | Fabio Berger | 2017-06-09 | 1 | -0/+1 | |
* | | Improve comment | Fabio Berger | 2017-06-09 | 1 | -1/+1 | |
* | | Add orderFillOrKillRequestsSchema and validate using it instead of looping ov... | Fabio Berger | 2017-06-09 | 1 | -4/+5 | |
* | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 2 | -26/+92 | |
|\| | ||||||
| * | Merge pull request #48 from 0xProject/interfaceTweaks | Leonid | 2017-06-08 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'master' into interfaceTweaks | Leonid | 2017-06-08 | 1 | -0/+6 | |
| | |\ | ||||||
| | * | | Make web3Wrapper protected instead of public | Fabio Berger | 2017-06-08 | 1 | -1/+1 | |
| * | | | Merge pull request #47 from 0xProject/is-valid-signature-contract | Leonid | 2017-06-08 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' into is-valid-signature-contract | Leonid | 2017-06-08 | 1 | -0/+6 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | * | | | Refactor isValidSignature | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 | |
| | | |/ | | |/| | ||||||
| * | | | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 1 | -0/+6 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -9/+12 | |
| * | | | Use isSenderAddressAsync | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 | |
| * | | | Address old feedback | Leonid Logvinov | 2017-06-08 | 1 | -2/+3 | |
| * | | | Fix spacing | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 | |
| * | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 1 | -25/+106 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Don't use batchFillOrderAsync for fillOrderAsync | Leonid Logvinov | 2017-06-08 | 1 | -3/+37 | |
| * | | | Add no-op test | Leonid Logvinov | 2017-06-08 | 1 | -1/+3 | |
| * | | | Remove old comment | Leonid Logvinov | 2017-06-08 | 1 | -1/+0 | |
| * | | | Refactor to use OrderFillRequest | Leonid Logvinov | 2017-06-07 | 1 | -22/+26 | |
| * | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -27/+3 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -17/+19 | |
| |\ \ \ \ | ||||||
| * | | | | | Add assertion for empty batch | Leonid Logvinov | 2017-06-07 | 1 | -0/+1 | |
| * | | | | | Fix linter errors | Leonid Logvinov | 2017-06-07 | 1 | -1/+2 | |
| * | | | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 | |
| * | | | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+45 | |
| * | | | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 1 | -4/+1 | |
| * | | | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -21/+43 | |
* | | | | | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -0/+6 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Add getOrderHashHexUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+6 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -2/+56 | |
|\| | | | | ||||||
| * | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -6/+9 | |
| * | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -5/+6 | |
| * | | | | Don't use batch function for normal one | Leonid Logvinov | 2017-06-08 | 1 | -3/+27 | |
| * | | | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 1 | -7/+57 | |
| |\ \ \ \ | ||||||
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -8/+11 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Use batchCancel for normal cancel | Leonid Logvinov | 2017-06-07 | 1 | -28/+5 | |
| | |_|/ | |/| | | ||||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -17/+19 | |
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 | |
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+45 | |
* | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 1 | -7/+70 | |
| |/ / |/| | | ||||||
* | | | Remove catch of invalid jump throws since there are many reasons the contract... | Fabio Berger | 2017-06-07 | 1 | -24/+14 | |
* | | | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 1 | -4/+4 | |
* | | | remove unused arg | Fabio Berger | 2017-06-07 | 1 | -2/+1 | |
* | | | merge master | Fabio Berger | 2017-06-07 | 1 | -31/+79 | |
|\| | | ||||||
| * | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 1 | -4/+1 | |
| |/ | ||||||
| * | Use union type Order|SignedOrder | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 | |
| * | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -16/+15 | |
| * | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 1 | -31/+35 | |
| * | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -1/+7 | |
| * | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 | |
| * | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 1 | -1/+52 | |
* | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -17/+88 | |
|/ | ||||||
* | Address feedback | Leonid Logvinov | 2017-06-06 | 2 | -3/+3 | |
* | Add isAnyAddressAvailableAsync | Leonid Logvinov | 2017-06-06 | 2 | -0/+3 | |
* | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 | |
* | Rename senderAccount to senderAddress | Leonid Logvinov | 2017-06-06 | 2 | -13/+13 | |
* | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 | |
* | Rename senderAccount to takerAddress | Leonid Logvinov | 2017-06-06 | 1 | -5/+5 | |
* | Add variableName to isSenderAddcountHexAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 | |
* | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 2 | -27/+19 | |
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -1/+46 | |
|\ | ||||||
| * | Run stopWatching in parallel | Fabio Berger | 2017-06-03 | 1 | -3/+4 | |
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -31/+98 | |
| |\ | ||||||
| * \ | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -4/+14 | |
| |\ \ | ||||||
| * | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ... | Fabio Berger | 2017-06-02 | 1 | -1/+45 | |
| * | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -0/+3 | |
| |\ \ \ | ||||||
* | \ \ \ | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 2 | -2/+41 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 1 | -31/+98 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+16 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | ||||||
| * | | | | 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 | 1 | -3/+4 | |
| |\ \ \ \ | ||||||
| * | | | | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 | |
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+15 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -7/+106 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 1 | -1/+16 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa... | Fabio Berger | 2017-06-01 | 1 | -0/+33 | |
* | | | | | | | | | Fix bug | Fabio Berger | 2017-06-03 | 1 | -1/+1 | |
* | | | | | | | | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -8/+201 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -12/+12 | |
| * | | | | | | | | 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 | 1 | -13/+12 | |
| * | | | | | | | | Assign wouldRoundingErrorOccur to a variable | Leonid Logvinov | 2017-06-02 | 1 | -2/+4 | |
| * | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 | |
| * | | | | | | | | 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 | 1 | -1/+1 | |
| * | | | | | | | | 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 | |
| * | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 1 | -15/+15 | |
| * | | | | | | | | Improve fillOrderAsync comment | Fabio Berger | 2017-06-02 | 1 | -3/+6 | |
| * | | | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 1 | -5/+5 | |
| * | | | | | | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 1 | -9/+45 | |
| * | | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 1 | -0/+16 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -4/+14 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -0/+3 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -4/+6 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 | |
| * | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+14 | |
| | |_|/ | |/| | | ||||||
| * | | | 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 | 1 | -0/+3 | |
| |\ \ \ | ||||||
| | * | | | Add expired check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 | |
| * | | | | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn... | Fabio Berger | 2017-06-01 | 1 | -6/+11 | |
| |/ / / | ||||||
| * | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 1 | -3/+0 | |
| * | | | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 1 | -8/+9 | |
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -0/+15 | |
| |\ \ \ | ||||||
| | * | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 | |
| | * | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 | |
| | * | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -0/+9 | |
| * | | | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 1 | -9/+9 | |
| |/ / / | ||||||
| * | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 1 | -3/+1 | |
| * | | | rename signed_order_schema to order_schemas | Fabio Berger | 2017-06-01 | 1 | -1/+1 | |
| * | | | Add convertToJSONSchemaCompatibleObject method | Fabio Berger | 2017-06-01 | 1 | -1/+4 | |
| * | | | Temporarily fix gas extimation | Leonid Logvinov | 2017-06-01 | 1 | -0/+13 | |
| * | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -8/+6 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Don't return contract response | Leonid Logvinov | 2017-05-31 | 1 | -2/+1 | |
| * | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -0/+110 | |
| |\ \ \ | ||||||
| * | | | | Add isBigNumber argument assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 | |
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 2 | -1/+57 | |
| |\ \ \ \ | ||||||
| * | | | | | Add throwErrorLogsAsErrors | Leonid Logvinov | 2017-05-30 | 1 | -6/+10 | |
| * | | | | | Add fillAmount parameter | 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 | |
| * | | | | | Finish ecSignature renaming | Leonid Logvinov | 2017-05-30 | 1 | -3/+3 | |
| * | | | | | 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 | 1 | -1/+63 | |
| * | | | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsync | Leonid Logvinov | 2017-05-30 | 1 | -6/+7 | |
* | | | | | | Add balance check to `transferAsync` and related test | Fabio Berger | 2017-06-02 | 1 | -0/+6 | |
* | | | | | | Improve comment | Fabio Berger | 2017-06-02 | 1 | -0/+2 | |
* | | | | | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper | Fabio Berger | 2017-06-02 | 1 | -15/+66 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 1 | -8/+6 | |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | remove InternalError type since this error could surface through the public i... | Fabio Berger | 2017-05-31 | 1 | -2/+2 | |
| * | | | 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 | |
* | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 1 | -1/+16 | |
|/ / / | ||||||
* | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -4/+32 | |
* | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -1/+26 | |
* | | | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 1 | -4/+4 | |
* | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up supp... | Fabio Berger | 2017-05-30 | 1 | -3/+17 | |
* | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 2 | -7/+29 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that... | Fabio Berger | 2017-05-30 | 2 | -13/+15 | |
| * | | 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 | -4/+14 | |
| * | | rename invalidateExchangeContract to invalidateContractInstance | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| * | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 1 | -0/+33 | |
| |\ \ | ||||||
| | * | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 1 | -2/+2 | |
| | * | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| * | | | Lazily instantiate exchangeContract and store as instance variable instead of... | Fabio Berger | 2017-05-30 | 1 | -3/+14 | |
| | |/ | |/| | ||||||
* | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+28 | |
| |/ |/| | ||||||
* | | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 1 | -0/+33 | |
|/ | ||||||
* | Lowercase schema names | Fabio Berger | 2017-05-30 | 1 | -2/+2 | |
* | Fix imports | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 | |
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 2 | -0/+85 |