Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | 2 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 2 | -0/+51 | |
| | | | | | | ||||||
| * | | | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 | |
| | | | | | | ||||||
| * | | | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 | |
| | | | | | | ||||||
| * | | | | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 | |
| | | | | | | ||||||
| * | | | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 3 | -21/+55 | |
| | | | | | | ||||||
* | | | | | | 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 | 2 | -2/+68 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts | |||||
| * | | | | 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 | 3 | -12/+69 | |
| |\ \ \ \ | ||||||
| * | | | | | Fix linter error | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 2 | -8/+12 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Use batchCancel for normal cancel | Leonid Logvinov | 2017-06-07 | 1 | -28/+5 | |
| | |_|/ | |/| | | ||||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 3 | -23/+24 | |
| | | | | ||||||
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 3 | -0/+57 | |
| | | | | ||||||
* | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 2 | -7/+81 | |
| |/ / |/| | | ||||||
* | | | make txOpts optional | Fabio Berger | 2017-06-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Remove catch of invalid jump throws since there are many reasons the ↵ | Fabio Berger | 2017-06-07 | 2 | -25/+14 | |
| | | | | | | | | | | | | contracts could throw this error | |||||
* | | | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 2 | -6/+6 | |
| | | | ||||||
* | | | Spacing fix | Fabio Berger | 2017-06-07 | 1 | -2/+1 | |
| | | | ||||||
* | | | remove unused arg | Fabio Berger | 2017-06-07 | 1 | -2/+1 | |
| | | | ||||||
* | | | remove space | Fabio Berger | 2017-06-07 | 1 | -1/+0 | |
| | | | ||||||
* | | | merge master | Fabio Berger | 2017-06-07 | 4 | -44/+108 | |
|\| | | ||||||
| * | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 | |
| | | | ||||||
| * | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 | |
| | | | ||||||
| * | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 | |
| |/ | ||||||
| * | Use union type Order|SignedOrder | Leonid Logvinov | 2017-06-07 | 2 | -4/+4 | |
| | | ||||||
| * | Make txOpts optional | Leonid Logvinov | 2017-06-07 | 1 | -7/+7 | |
| | | ||||||
| * | Address feedback | Leonid Logvinov | 2017-06-07 | 4 | -45/+58 | |
| | | ||||||
| * | 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 | 2 | -31/+39 | |
| | | ||||||
| * | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 2 | -1/+9 | |
| | | ||||||
| * | Merge branch 'master' into cancelAsync | Leonid Logvinov | 2017-06-06 | 1 | -2/+3 | |
| |\ | ||||||
| * | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 2 | -1/+58 | |
| | | | ||||||
* | | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 6 | -45/+131 | |
| |/ |/| | ||||||
* | | avoid newline issues by putting the assertion message on a single line | Fabio Berger | 2017-06-06 | 1 | -2/+3 | |
|/ | ||||||
* | Merge pull request #39 from 0xProject/senderAccount | Leonid | 2017-06-06 | 6 | -66/+38 | |
|\ | | | | | Make methods accept senderAccount | |||||
| * | Address feedback | Leonid Logvinov | 2017-06-06 | 3 | -5/+5 | |
| | | ||||||
| * | Add isAnyAddressAvailableAsync | Leonid Logvinov | 2017-06-06 | 4 | -6/+7 | |
| | | ||||||
| * | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 4 | -13/+13 | |
| | | ||||||
| * | Rename senderAddress to signerAddress | Leonid Logvinov | 2017-06-06 | 1 | -4/+4 | |
| | | ||||||
| * | Use variable name in assertin message | Leonid Logvinov | 2017-06-06 | 1 | -3/+4 | |
| | | ||||||
| * | Rename accounts to addreses | Leonid Logvinov | 2017-06-06 | 3 | -10/+10 | |
| | | ||||||
| * | Rename senderAccount to senderAddress | Leonid Logvinov | 2017-06-06 | 4 | -23/+23 | |
| | | ||||||
| * | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 4 | -6/+6 | |
| | | ||||||
| * | Rename senderAccount to takerAddress | Leonid Logvinov | 2017-06-06 | 1 | -5/+5 | |
| | | ||||||
| * | Remove redundant reassignment | Leonid Logvinov | 2017-06-06 | 1 | -3/+2 | |
| | | ||||||
| * | Fix comments | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 | |
| | | ||||||
| * | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 | |
| | | ||||||
| * | Add variableName to isSenderAddcountHexAsync | Leonid Logvinov | 2017-06-06 | 3 | -7/+8 | |
| | | ||||||
| * | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 6 | -68/+38 | |
| | | ||||||
* | | Add tests to number regex and BigNumber serialization & fix bugs | Leonid Logvinov | 2017-06-05 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 10 | -568/+131 | |
|\ | | | | | 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 | |
| | | ||||||
| * | Update artifacts | Fabio Berger | 2017-06-03 | 6 | -566/+35 | |
| | | ||||||
| * | Revert unintentional artifact changes | Fabio Berger | 2017-06-03 | 6 | -35/+566 | |
| | | ||||||
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -52/+126 | |
| |\ | | | | | | | | | | | | | | | | | | | # 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 | 1 | -4/+14 | |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | |||||
| * | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 4 | -3/+91 | |
| | | | | | | | | | | | | | | | | if user updates the provider | |||||
| * | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 3 | -4/+10 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | |||||
| * | | | | Update artifacts | Fabio Berger | 2017-06-02 | 6 | -561/+30 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 6 | -9/+70 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | |||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 4 | -56/+126 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 3 | -7/+23 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | |||||
| * | | | | 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 | 1 | -3/+9 | |
| | | | | | | | | | | | | | | | | | | | | 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 | 3 | -4/+9 | |
| |\ \ \ \ | ||||||
| * | | | | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 3 | -5/+21 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 9 | -69/+329 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 2 | -1/+17 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fix bug | Fabio Berger | 2017-06-03 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | 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 | 9 | -77/+451 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | |||||
| * | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 2 | -59/+66 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 1 | -5/+6 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -20/+20 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | 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 | 2 | -22/+15 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Assign wouldRoundingErrorOccur to a variable | Leonid Logvinov | 2017-06-02 | 1 | -2/+4 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | 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 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | 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 comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 2 | -16/+16 | |
| | | | | | | | | | ||||||
| * | | | | | | | | 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 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | 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 | 2 | -9/+52 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add ProtocolTokenArtifacts | Leonid Logvinov | 2017-06-02 | 1 | -0/+321 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 2 | -0/+21 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -4/+14 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵ | Fabio Berger | 2017-06-02 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined if non available | |||||
| * | | | | | | | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -0/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 2 | -0/+9 | |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test | |||||
| * | | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 3 | -5/+11 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 3 | -4/+20 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Fix import | Fabio Berger | 2017-06-01 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵ | Fabio Berger | 2017-06-01 | 1 | -28/+41 | |
| | | | | | | | | | | | | | | | | | | | | artifacts | |||||
| * | | | | 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 | 2 | -0/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Add expired check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Add EXPIRED error type | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Add comment for fillOrderAsync method, rename fillAmount to ↵ | Fabio Berger | 2017-06-01 | 1 | -6/+11 | |
| |/ / / / | | | | | | | | | | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer | |||||
| * | | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 2 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+23 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | |||||
| | * | | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 2 | -1/+5 | |
| | | | | | | ||||||
| | * | | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 2 | -0/+4 | |
| | | | | | | ||||||
| | * | | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 2 | -0/+14 | |
| | | | | | | ||||||
| * | | | | | 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 | |
| | | | | | ||||||
| * | | | | 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 | 1 | -4/+0 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix types hell with, chai and chai-as-promised | Leonid Logvinov | 2017-06-01 | 1 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | 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 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Type estimateGas | Leonid Logvinov | 2017-06-01 | 1 | -4/+6 | |
| | | | | | ||||||
| * | | | | Remove TxData | Leonid Logvinov | 2017-06-01 | 1 | -5/+1 | |
| | | | | | ||||||
| * | | | | Temporarily fix gas extimation | Leonid Logvinov | 2017-06-01 | 1 | -0/+13 | |
| | | | | | ||||||
| * | | | | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 2 | -0/+10 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 2 | -15/+14 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 3 | -4/+4 | |
| | | | | | ||||||
| * | | | | Don't return contract response | Leonid Logvinov | 2017-05-31 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Set bignumber config | Leonid Logvinov | 2017-05-31 | 2 | -0/+11 | |
| | | | | | ||||||
| * | | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 4 | -0/+131 | |
| |\ \ \ \ | ||||||
| * | | | | | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 1 | -29/+16 | |
| | | | | | | ||||||
| * | | | | | Remove spaces in types | Leonid Logvinov | 2017-05-30 | 1 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | Add isBigNumber argument assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 7 | -6/+109 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Add throwErrorLogsAsErrors | Leonid Logvinov | 2017-05-30 | 1 | -6/+10 | |
| | | | | | | | ||||||
| * | | | | | | 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 | |
| | | | | | | | ||||||
| * | | | | | | 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 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 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 2 | -1/+96 | |
| | | | | | | | | ||||||
| * | | | | | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsync | Leonid Logvinov | 2017-05-30 | 2 | -6/+14 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | 5 | -18/+93 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | Fix tslint issues | Fabio Berger | 2017-06-02 | 1 | -2/+2 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 2 | -15/+14 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | 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 | |
| | | | | | ||||||
* | | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 2 | -1/+17 | |
|/ / / / | ||||||
* | | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 3 | -4/+34 | |
| | | | | ||||||
* | | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 2 | -1/+34 | |
| | | | | ||||||
* | | | | use token instead of erc20 | Fabio Berger | 2017-05-30 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | 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 | 2 | -7/+30 | |
| | | | | | | | | | | | | | | | | supporting another spec | |||||
* | | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 4 | -13/+44 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | # Conflicts: # src/0x.js.ts | |||||
| * | | | Remove mention of internal cleanup from public comment | Fabio Berger | 2017-05-30 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter ↵ | Fabio Berger | 2017-05-30 | 2 | -13/+15 | |
| | | | | | | | | | | | | | | | | that instantiates contract instance if not already instantiated | |||||
| * | | | remove unused declarations | Fabio Berger | 2017-05-30 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | improve comment | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Make tokenRegistry contract instantiation lazy and clear it on provider update | Fabio Berger | 2017-05-30 | 2 | -4/+15 | |
| | | | | ||||||
| * | | | rename invalidateExchangeContract to invalidateContractInstance | Fabio Berger | 2017-05-30 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 6 | -4/+73 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' into tokenRegistry | Fabio Berger | 2017-05-30 | 2 | -5/+4 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts | |||||
| | | * \ \ | Merge pull request #22 from 0xProject/regex-fix | Fabio Berger | 2017-05-30 | 1 | -4/+3 | |
| | | |\ \ \ | | | | | | | | | | | | | | | Fix the empty code regex | |||||
| | | | * | | | Fix the empty code regex | Leonid Logvinov | 2017-05-30 | 1 | -4/+3 | |
| | | | | |/ | | | | |/| | ||||||
| | * | | | | Improve type definitions | Fabio Berger | 2017-05-30 | 1 | -2/+6 | |
| | | | | | | ||||||
| | * | | | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 2 | -2/+5 | |
| | | | | | | ||||||
| | * | | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Add setProvider method to 0x.js that updates the web3 provider and ↵ | Fabio Berger | 2017-05-30 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | invalidates any contractInstances instantiated with the old provider | |||||
| * | | | | | Lazily instantiate exchangeContract and store as instance variable instead ↵ | Fabio Berger | 2017-05-30 | 2 | -3/+17 | |
| | |/ / / | |/| | | | | | | | | | | | | | of re-instantiating on every call | |||||
| * | | | | make web3Wrapper a private instance variable | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'tokenRegistry' into erc20Wrapper | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistry | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| |\| | | ||||||
| | * | | Reverts: 7e96b45ea0c51ca5589640018172a91a35596148 which broke this regex for ↵ | Fabio Berger | 2017-05-30 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | the `0x0` edge-case | |||||
* | / | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 3 | -0/+37 | |
|/ / | ||||||
* | | Add tests for getTokensAsync including schema validation | Fabio Berger | 2017-05-30 | 2 | -0/+14 | |
| | | ||||||
* | | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 3 | -0/+49 | |
|/ | ||||||
* | Lowercase schema names | Fabio Berger | 2017-05-30 | 4 | -12/+12 | |
| | ||||||
* | improve comment | Fabio Berger | 2017-05-29 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into addSignOrderHashAndTests | Fabio Berger | 2017-05-29 | 1 | -0/+1 | |
|\ | | | | | | | | | | | | | # Conflicts: # package.json # src/globals.d.ts # test/0x.js_test.ts | |||||
| * | Merge pull request #16 from 0xProject/umd-tests | Fabio Berger | 2017-05-29 | 1 | -1/+2 | |
| |\ | | | | | | | Umd tests | |||||
| | * | Address feedback | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | Make eventually a PromisedAssertion | Leonid Logvinov | 2017-05-29 | 1 | -1/+2 | |
| | | | ||||||
* | | | fix declaration | Fabio Berger | 2017-05-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use disable-next-line instead of disable and always put rule that is being ↵ | Fabio Berger | 2017-05-29 | 1 | -2/+1 | |
| | | | | | | | | | | | | disabled | |||||
* | | | Add declarations for find-versions and compare-versions | Fabio Berger | 2017-05-29 | 1 | -2/+12 | |
| | | | ||||||
* | | | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 4 | -1/+71 | |
|/ / | ||||||
* / | Standardize all comments | Fabio Berger | 2017-05-29 | 1 | -4/+4 | |
|/ | ||||||
* | Fix imports | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 | |
| | ||||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 11 | -0/+0 | |
| | ||||||
* | Merge branch 'master' of github.com:0xProject/0x.js | Fabio Berger | 2017-05-29 | 15 | -25/+3199 | |
|\ | | | | | | | | | | | # Conflicts: # src/ts/0x.js.ts # src/ts/utils/utils.ts | |||||
| * | Refactor to ternary | Fabio Berger | 2017-05-27 | 1 | -6/+1 | |
| | | ||||||
| * | Make zero address regex stricter | Leonid Logvinov | 2017-05-27 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'implementFirstExchangeMethod' of github.com:0xProject/0x.js ↵ | Fabio Berger | 2017-05-27 | 1 | -1/+1 | |
| |\ | | | | | | | | | | into implementFirstExchangeMethod | |||||
| | * | Simplify zero address regex | Leonid Logvinov | 2017-05-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | remove todo | Fabio Berger | 2017-05-27 | 1 | -1/+0 | |
| |/ | ||||||
| * | remove outdated comment | Fabio Berger | 2017-05-26 | 1 | -2/+0 | |
| | | ||||||
| * | return undefined if not address found | Fabio Berger | 2017-05-26 | 1 | -3/+3 | |
| | | ||||||
| * | Add missing return types | Fabio Berger | 2017-05-26 | 2 | -3/+3 | |
| | | ||||||
| * | move console log into UNHANDLED_ERROR clause | Fabio Berger | 2017-05-26 | 1 | -1/+1 | |
| | | ||||||
| * | rename networkId to networkIdIfExists | Fabio Berger | 2017-05-26 | 1 | -2/+4 | |
| | | ||||||
| * | remove comment | Fabio Berger | 2017-05-26 | 1 | -1/+0 | |
| | | ||||||
| * | import re-order | Fabio Berger | 2017-05-26 | 1 | -2/+2 | |
| | | ||||||
| * | Setup blockchain snapshotting before/after every test, implemented unit ↵ | Fabio Berger | 2017-05-26 | 1 | -0/+5 | |
| | | | | | | | | tests for exchangeWrapper.isValidSignature | |||||
| * | Add missing semi-colon | Fabio Berger | 2017-05-26 | 1 | -1/+1 | |
| | | ||||||
| * | cleanup isValidSignature method | Fabio Berger | 2017-05-26 | 1 | -5/+6 | |
| | | ||||||
| * | Add missing require | Fabio Berger | 2017-05-26 | 1 | -0/+1 | |
| | | ||||||
| * | Spacing and import re-order | Fabio Berger | 2017-05-26 | 1 | -3/+4 | |
| | | ||||||
| * | Remove unused bignum import | Leonid Logvinov | 2017-05-26 | 1 | -1/+0 | |
| | | ||||||
| * | Merge branch 'master' into implementFirstExchangeMethod | Fabio Berger | 2017-05-26 | 4 | -1/+71 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # src/ts/0x.js.ts # src/ts/globals.d.ts # src/ts/types.ts |