aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-3/+8
|\
| * Merge pull request #56 from 0xProject/cancel-testsFabio Berger2017-06-101-3/+8
| |\ | | | | | | Add test for zeroEx.exchange.getCanceledTakerAmountAsync
| | * Add test for zeroEx.exchange.getCanceledTakerAmountAsyncLeonid Logvinov2017-06-101-3/+8
| |/
* | Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-5/+4
|\|
| * Merge pull request #53 from 0xProject/async-bugLeonid2017-06-101-5/+4
| |\ | | | | | | Fix the bug of not awaiting an async function
| | * Merge branch 'master' into async-bugLeonid2017-06-097-21/+157
| | |\ | | |/ | |/|
| | * Use for ofLeonid Logvinov2017-06-091-2/+2
| | |
| | * Fix the bug of not awaiting an async functionLeonid Logvinov2017-06-091-4/+3
| | |
* | | Fix testsLeonid Logvinov2017-06-101-4/+4
| | |
* | | Remove onlyLeonid Logvinov2017-06-091-1/+1
| | |
* | | Add LogCancel test to subscribeAsyncLeonid Logvinov2017-06-091-2/+18
|/ /
* | Merge pull request #49 from 0xProject/fillOrderUpToAsyncLeonid2017-06-095-5/+121
|\ \ | | | | | | Implement fillOrderUpToAsync
| * \ Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-093-16/+36
| |\ \ | |/ / |/| |
* | | Merge pull request #50 from 0xProject/schemasLeonid2017-06-093-16/+36
|\ \ \ | |_|/ |/| | Add orderCancelrequestsSchema and orderFillRequestsSchema
| * | Fix the other schema bugLeonid Logvinov2017-06-091-2/+2
| | |
| * | Merge branch 'master' into schemasLeonid2017-06-091-4/+0
| |\ \ | |/ / |/| |
| * | Fix schema errorLeonid Logvinov2017-06-091-2/+2
| | |
| * | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-093-16/+36
| | |
| | * Address feedbackLeonid Logvinov2017-06-093-7/+4
| | |
| | * Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-4/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #51 from 0xProject/sender-account-assertLeonid2017-06-091-4/+0
|\ \ \ | |/ / |/| | Remove isSenderAddressAvailableAsync
| * | Remove isSenderAddressAvailableAsyncLeonid Logvinov2017-06-091-4/+0
|/ /
| * Add signedOrdersScxhemaLeonid Logvinov2017-06-092-0/+9
| |
| * Address feedbackLeonid Logvinov2017-06-092-2/+2
| |
| * Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-093-7/+10
| |
| * Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-098-90/+205
| |\ | |/ |/|
* | Merge pull request #44 from 0xProject/batchFillOrKillLeonid2017-06-098-90/+205
|\ \ | | | | | | Implement BatchFillOrKill and tests
| * | fix indentationFabio Berger2017-06-091-13/+13
| | |
| * | add comment explaining the use of anyFabio Berger2017-06-091-0/+1
| | |
| * | Improve commentFabio Berger2017-06-091-1/+1
| | |
| * | Add orderFillOrKillRequestsSchema and validate using it instead of looping ↵Fabio Berger2017-06-096-19/+34
| | | | | | | | | | | | over the requests and validating them individually
| * | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-099-354/+371
| |\ \ | |/ / |/| | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
| * | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-082-0/+28
| |\ \
| * \ \ Merge branch 'master' into batchFillOrKillFabio Berger2017-06-083-25/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts
| * | | | Implement batchFillOrKill and testsFabio Berger2017-06-083-58/+157
| | | | |
| | | | * Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+18
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Fix isValidSignature testsFabio Berger2017-06-091-16/+18
| | | | |
| | | | * Add tests for fillOrdersUpToLeonid Logvinov2017-06-092-7/+41
| | | | |
| | | | * Implement fillOrderUpToAsyncLeonid Logvinov2017-06-082-0/+73
| |_|_|/ |/| | |
* | | | Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-083-11/+11
|\ \ \ \ | | | | | | | | | | Interface tweaks
| * \ \ \ Merge branch 'master' into interfaceTweaksLeonid2017-06-082-0/+28
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Make web3Wrapper protected instead of publicFabio Berger2017-06-082-3/+3
| | | | |
| * | | | Fix commentsFabio Berger2017-06-081-2/+2
| | | | |
| * | | | rename decimals to numDecimals for clarityFabio Berger2017-06-081-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #47 from 0xProject/is-valid-signature-contractLeonid2017-06-085-129/+33
|\ \ \ \ | | | | | | | | | | Refactor isValidSignature
| * \ \ \ Merge branch 'master' into is-valid-signature-contractLeonid2017-06-082-0/+28
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove unused importLeonid Logvinov2017-06-081-1/+0
| | | | |
| * | | | Fix linter errorLeonid Logvinov2017-06-081-3/+3
| | | | |
| * | | | Rewrite isValidSignature testsLeonid Logvinov2017-06-083-57/+31
| | | | |
| * | | | Remove tests for isValidSignatureUsingContractCallAsyncLeonid Logvinov2017-06-081-78/+0
| | | | |
| * | | | Move isValidSignature back from utilsLeonid Logvinov2017-06-082-16/+13
| | | | |
| * | | | Refactor isValidSignatureLeonid Logvinov2017-06-084-28/+40
| | |/ / | |/| |
* | | | Merge pull request #45 from 0xProject/batchFillAsyncLeonid2017-06-084-193/+304
|\ \ \ \ | |_|/ / |/| | | Batch fill async
| * | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| | | |
| * | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| | | |
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-082-0/+28
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #46 from 0xProject/order-hash-contractFabio Berger2017-06-082-0/+28
|\ \ \ \ | |_|/ / |/| | | Add getOrderHashHexUsingContractCallAsync
| * | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-082-0/+28
|/ / /
| * | Address feedbackLeonid Logvinov2017-06-083-16/+29
| | |
| * | Fix names in typesLeonid Logvinov2017-06-081-2/+2
| | |
| * | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| | |
| * | Address old feedbackLeonid Logvinov2017-06-082-8/+3
| | |
| * | Fix spacingLeonid Logvinov2017-06-081-2/+2
| | |
| * | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-085-37/+198
| |\ \ | |/ / |/| |
* | | Merge pull request #43 from 0xProject/batchCancelAsyncLeonid2017-06-083-25/+140
|\ \ \ | | | | | | | | Batch cancel order async
| * | | Address feedbackLeonid Logvinov2017-06-081-6/+9
| | | |
| * | | Format inputsLeonid Logvinov2017-06-081-1/+2
| | | |
| * | | Address feedbackLeonid Logvinov2017-06-081-5/+6
| | | |
| * | | Don't use batch function for normal oneLeonid Logvinov2017-06-081-3/+27
| | | |
| * | | Merge branch 'master' into batchCancelAsyncLeonid2017-06-085-14/+169
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #42 from 0xProject/addExchangeMethodsLeonid2017-06-085-15/+171
|\ \ \ \ | | |_|/ | |/| | Add FillOrKillAsync method & tests
| * | | make txOpts optionalFabio Berger2017-06-071-2/+2
| | | |
| * | | Remove catch of invalid jump throws since there are many reasons the ↵Fabio Berger2017-06-072-25/+14
| | | | | | | | | | | | | | | | contracts could throw this error
| * | | add `hex` to function and variable name for clarityFabio Berger2017-06-073-7/+7
| | | |
| * | | Spacing fixFabio Berger2017-06-071-2/+1
| | | |
| * | | Fix tests with removed shouldCheckTransferFabio Berger2017-06-071-6/+3
| | | |
| * | | remove unused argFabio Berger2017-06-071-2/+1
| | | |
| * | | remove spaceFabio Berger2017-06-071-1/+0
| | | |
| * | | merge masterFabio Berger2017-06-076-49/+160
| |\ \ \ | |/ / / |/| | |
| * | | Implement fillOrKill & testsFabio Berger2017-06-077-46/+233
| | | |
| | * | Fix linter errorLeonid Logvinov2017-06-071-1/+1
| | | |
| | * | Address feedbackLeonid Logvinov2017-06-073-16/+16
| | | |
| | | * Don't use batchFillOrderAsync for fillOrderAsyncLeonid Logvinov2017-06-081-3/+37
| | | |
| | | * Add no-op testLeonid Logvinov2017-06-082-4/+6
| | | |
| | | * Add success testLeonid Logvinov2017-06-082-5/+33
| | | |
| | | * Remove old commentLeonid Logvinov2017-06-081-1/+0
| | | |
| | | * Refactor to use OrderFillRequestLeonid Logvinov2017-06-071-22/+26
| | | |
| | | * Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-072-27/+8
| | | |\ | | | |/ | | |/|
| | * | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | | |
| | | * Remove onlyLeonid Logvinov2017-06-071-1/+1
| | | |
| | | * Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-073-29/+46
| | | |\ | | | |/ | | |/|
| | * | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-074-34/+45
| | | |
| | * | Add tests for batchCancelAsyncLeonid Logvinov2017-06-073-26/+68
| | | |
| | * | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-073-0/+57
| |/ / |/| |
* | | Merge pull request #40 from 0xProject/cancelAsyncLeonid2017-06-077-60/+185
|\ \ \ | |/ / |/| | Add cancelOrderAsync
| * | Add comments for datesLeonid Logvinov2017-06-071-2/+2
| | |
| * | Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| | |
| * | Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| | |
| * | Update 0x.js.tsLeonid2017-06-071-2/+1
| | |
| | * Move fillableAmount to initialization sectionLeonid Logvinov2017-06-071-8/+17
| | |
| | * Move initialization upLeonid Logvinov2017-06-071-15/+15
| | |
| | * Move fillOrderAsync to fill order describe blockLeonid Logvinov2017-06-071-179/+185
| | |
| | * Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| | |
| | * Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| | |
| | * Add tests for batchCancelAsyncLeonid Logvinov2017-06-073-26/+68
| | |
| | * Add initial batchCancelAsync implementationLeonid Logvinov2017-06-072-0/+51
| | |
| | * Add comments for datesLeonid Logvinov2017-06-071-2/+2
| | |
| | * Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| | |
| | * Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| | |
| | * Update 0x.js.tsLeonid2017-06-071-2/+1
| | |
| | * Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-073-21/+55
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-072-4/+4
| |
| * Make txOpts optionalLeonid Logvinov2017-06-071-7/+7
| |
| * Address feedbackLeonid Logvinov2017-06-075-47/+60
| |
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| |
| * Add missing semicolonLeonid Logvinov2017-06-061-1/+1
| |
| * Remove onlyLeonid Logvinov2017-06-061-1/+1
| |
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-063-31/+44
| |
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-063-2/+26
| |
| * Merge branch 'master' into cancelAsyncLeonid Logvinov2017-06-063-5/+8
| |\ | |/ |/|
* | Merge pull request #41 from 0xProject/testFixesLeonid2017-06-063-5/+8
|\ \ | | | | | | Fix Test Failures
| * | Pass nonExistentSenderAddress so that we get the proper rejectionFabio Berger2017-06-061-1/+2
| | |
| * | avoid newline issues by putting the assertion message on a single lineFabio Berger2017-06-062-4/+6
|/ /
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| |
| * Add initial implementation with success testLeonid Logvinov2017-06-064-5/+88
|/
* Update schema_test.tsLeonid2017-06-061-1/+1
|
* Merge pull request #39 from 0xProject/senderAccountLeonid2017-06-0611-123/+104
|\ | | | | Make methods accept senderAccount
| * Address feedbackLeonid Logvinov2017-06-063-5/+5
| |
| * Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-064-6/+7
| |
| * Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-065-16/+16
| |
| * Rename senderAddress to signerAddressLeonid Logvinov2017-06-061-4/+4
| |
| * Last round of renamingsLeonid Logvinov2017-06-062-13/+13
| |
| * Use variable name in assertin messageLeonid Logvinov2017-06-062-4/+5
| |
| * Remove unused variableLeonid Logvinov2017-06-061-1/+0
| |
| * Rename accounts to addresesLeonid Logvinov2017-06-066-13/+13
| |
| * Remove message param from beforeLeonid Logvinov2017-06-061-1/+1
| |
| * Rename senderAccount to senderAddressLeonid Logvinov2017-06-064-23/+23
| |
| * Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-065-9/+9
| |
| * Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
| |
| * Remove redundant reassignmentLeonid Logvinov2017-06-061-3/+2
| |
| * Fix commentsLeonid Logvinov2017-06-061-1/+1
| |
| * Add tests for isSenderAccountHexAsyncLeonid Logvinov2017-06-061-0/+33
| |
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| |
| * Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-063-7/+8
| |
| * Make methods accept senderAccountLeonid Logvinov2017-06-0510-125/+72
| |
* | Merge pull request #35 from 0xProject/chai-setupLeonid2017-06-065-18/+22
|\ \ | | | | | | Add chai_setup
| * | Update chai_setup.tsLeonid2017-06-061-1/+1
| | |
| * | Merge branch 'master' into chai-setupLeonid2017-06-062-4/+16
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-065-12/+12
| | | |
| * | | Add chai_setupLeonid Logvinov2017-06-055-17/+22
| | |/ | |/|
* | | Merge pull request #37 from 0xProject/umd-ciLeonid2017-06-062-1/+8
|\ \ \ | | | | | | | | Add script to run UMD tests
| * | | Address feedbackLeonid Logvinov2017-06-061-1/+1
| | | |
| * | | Add script to run UMD testsLeonid Logvinov2017-06-052-1/+8
| |/ /
* | | Merge pull request #34 from 0xProject/number-regexLeonid2017-06-062-1/+47
|\ \ \ | |_|/ |/| | Add tests to number regex and BigNumber serialization & fix bugs
| * | Address feedbackLeonid Logvinov2017-06-061-18/+23
| | |
| * | Add tests to number regex and BigNumber serialization & fix bugsLeonid Logvinov2017-06-052-1/+42
| |/
* | Merge pull request #38 from 0xProject/async-errorsLeonid2017-06-061-4/+6
|\ \ | | | | | | Add a couple of awaits and returns for async tests
| * | Add chai-as-promisedLeonid Logvinov2017-06-051-0/+2
| | |
| * | Add a couple of awaits and returns for async testsLeonid Logvinov2017-06-051-4/+4
| |/
* | Merge pull request #36 from 0xProject/regression-test-transferFromLeonid2017-06-061-0/+11
|\ \ | |/ |/| Add regression test for transferFrom bug
| * Address feedbackLeonid Logvinov2017-06-061-1/+2
| |
| * Add regression test for transferFrom bugLeonid Logvinov2017-06-051-0/+10
|/
* Upgrade truffle-contract to the version that includes 'at' fixLeonid Logvinov2017-06-052-70/+183
|
* Merge pull request #33 from 0xProject/greenkeeper/initialLeonid2017-06-032-2/+4
|\ | | | | Update dependencies to enable Greenkeeper 🌴
| * docs(readme): add Greenkeeper badgegreenkeeper[bot]2017-06-031-0/+2
| |
| * chore(package): update dependenciesgreenkeeper[bot]2017-06-031-2/+2
| |
* | Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-0312-573/+218
|\ \ | | | | | | Implement zeroEx.exchange.subscribeAsync
| * | Consolidate the ExchangeContract type and flesh out type definition for ↵Fabio Berger2017-06-031-20/+19
| | | | | | | | | | | | isValidSignature.call
| * | Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| | |
| * | Be more specific with blockParam valid valuesFabio Berger2017-06-031-2/+4
| | |
| * | remove spaceFabio Berger2017-06-031-1/+1
| | |
| * | Update artifactsFabio Berger2017-06-036-566/+35
| | |
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-10/+10
| |\| | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # test/exchange_wrapper_test.ts # test/utils/fill_scenarios.ts
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-0/+4
| |\ \
| * | | Revert unintentional artifact changesFabio Berger2017-06-036-35/+566
| | | |
| * | | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-038-150/+378
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * \ \ \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-022-4/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts
| * | | | | Add tests for subscribeAsync, making sure events are caught and that ↵Fabio Berger2017-06-021-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | subscriptions are removed on provider change
| * | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵Fabio Berger2017-06-025-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | if user updates the provider
| * | | | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-025-33/+90
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| * | | | | | Update artifactsFabio Berger2017-06-026-561/+30
| | | | | | |
* | | | | | | Merge pull request #29 from 0xProject/remainingTokenMethodsLeonid2017-06-036-48/+240
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Implement Remaining Token Methods
| * | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-0310-18/+171
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts
* | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelledLeonid2017-06-038-17/+166
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement Unavailable, Filled and Cancelled
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-038-155/+375
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-36/+128
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| * | | | | | Simplify testsFabio Berger2017-06-021-16/+11
| | | | | | |
| * | | | | | improve commentFabio Berger2017-06-021-1/+4
| | | | | | |
| * | | | | | Add comment about the isString assertion lest the next developer tries to ↵Fabio Berger2017-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | use a stricter assertion (i.e isHexString) which we intentionally did not do
| * | | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵Fabio Berger2017-06-023-11/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and getCanceledTakerAmountAsync
| * | | | | | Always wrap BigNumbers returned by web3 with our own version and add commentFabio Berger2017-06-022-5/+11
| | | | | | |
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-44/+82
| |\ \ \ \ \ \
| * | | | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| | | | | | | |
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-024-12/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-10/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-0218-285/+984
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-015-43/+274
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵Fabio Berger2017-06-012-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync
| * | | | | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHashFabio Berger2017-06-013-4/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Use forked version of chai-bignumber while the PR is waiting for a reviewLeonid Logvinov2017-06-032-1/+5
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| | | | | | | | | * | Fix bugFabio Berger2017-06-032-8/+6
| | | | | | | | | | |
| | | | | | | | | * | Fix commentFabio Berger2017-06-031-1/+1
| | | | | | | | | | |
| | | | | | | | | * | Add missing async suffixFabio Berger2017-06-032-2/+2
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-0322-293/+1366
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts
* | | | | | | | | | | Add includeStack config to chai setup so that we get stackTracesFabio Berger2017-06-034-0/+4
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #30 from 0xProject/fillOrderAsyncLeonid2017-06-0320-291/+1360
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fillOrderAsync
| * | | | | | | | | | Fix undefined web3 issueFabio Berger2017-06-031-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix linter errorsLeonid Logvinov2017-06-031-4/+12
| | | | | | | | | | |
| * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-032-3/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-035-95/+100
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-031-8/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-032-10/+10
| | | | | | | | | | | |
| | * | | | | | | | | | Fix test nameLeonid Logvinov2017-06-031-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-032-6/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Remove spacesLeonid Logvinov2017-06-031-3/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-033-28/+28
| | | | | | | | | | | |
| | * | | | | | | | | | Allign argumentsLeonid Logvinov2017-06-031-3/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Rewrite commentLeonid Logvinov2017-06-031-5/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-033-35/+28
| | | | | | | | | | | |
| | * | | | | | | | | | Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-023-3/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-023-3/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Don't pass zrxTokenAsignLeonid Logvinov2017-06-021-6/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Rename validation functionsLeonid Logvinov2017-06-021-8/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Add getZRXTokenAddressAsyncLeonid Logvinov2017-06-021-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fix orderingFabio Berger2017-06-031-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-023-37/+37
| | | | | | | | | | |
| * | | | | | | | | | Improve fillOrderAsync commentFabio Berger2017-06-021-3/+6
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-321/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove protocol token artifactsLeonid Logvinov2017-06-021-321/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Improve error names and remove duplicate importFabio Berger2017-06-022-8/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Improve commentFabio Berger2017-06-021-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | remove ProtocolTokenFabio Berger2017-06-021-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename coinBase to coinbaseLeonid Logvinov2017-06-022-12/+12
| | | | | | | | | | |
| * | | | | | | | | | Refactor balance & allowance testsLeonid Logvinov2017-06-021-47/+42
| | | | | | | | | | |
| * | | | | | | | | | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-023-10/+96
| | | | | | | | | | |
| * | | | | | | | | | Add success test for fill with feesLeonid Logvinov2017-06-022-5/+33
| | | | | | | | | | |
| * | | | | | | | | | Add token utilsLeonid Logvinov2017-06-021-0/+23
| | | | | | | | | | |
| * | | | | | | | | | Add ProtocolTokenArtifactsLeonid Logvinov2017-06-022-1/+322
| | | | | | | | | | |
| * | | | | | | | | | Add fill scenario with feesLeonid Logvinov2017-06-022-10/+41
| | | | | | | | | | |
| * | | | | | | | | | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-024-18/+61
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Validate maker balance and allowance & testsLeonid Logvinov2017-06-022-4/+39
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-0/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add test for valid partial fillLeonid Logvinov2017-06-021-0/+17
| | | | | | | | | |
| * | | | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵Fabio Berger2017-06-023-6/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined if non available
| * | | | | | | | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-022-15/+35
| | | | | | | | |
| * | | | | | | | Introduce coinBase accountLeonid Logvinov2017-06-024-16/+38
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 14:33:16 +0800