aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix test failures caused by testrpc new eth_sign behaviourLeonid Logvinov2017-07-012-2/+6
|
* Additional EtherToken comment changesFabio Berger2017-06-271-10/+10
|
* Improve EtherToken commentsFabio Berger2017-06-271-10/+10
|
* Merge pull request #81 from 0xProject/addWrappedETHSupportLeonid2017-06-275-4/+99
|\ | | | | Add Wrapped ETH Support
| * refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ↵Fabio Berger2017-06-272-7/+5
| | | | | | | | assertions to check if the discrepancy between the existing ETH balance and expected balance is small enough to simply be the gas cost used by the transaction.
| * Fix typoFabio Berger2017-06-272-2/+2
| |
| * Implement EtherTokenWrapper and tests, with deposit and withdraw methodsFabio Berger2017-06-264-0/+95
| |
| * Add missing return commentFabio Berger2017-06-261-0/+1
| |
| * Re-wrap BigNumber returned from web3 in `getBalanceInEthAsync`Fabio Berger2017-06-261-1/+2
| |
* | Add comment before declarationsLeonid Logvinov2017-06-231-1/+1
| |
* | Add kovan integration testsLeonid Logvinov2017-06-231-0/+8
|/
* Fix incorrect merge consequencesLeonid Logvinov2017-06-231-3/+3
|
* Merge branch 'master' into fill-order-amuontLeonid2017-06-2316-91/+682
|\
| * Update contractsLeonid Logvinov2017-06-226-17/+622
| |
| * Revert "Use different lodash import syntax which allows to include only used ↵Leonid2017-06-2210-73/+60
| | | | | | | | functions"
* | Return filledTakerTokenAmount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-3/+10
| |
* | Return cancelledAmount from cancelOrderAsyncLeonid Logvinov2017-06-221-1/+6
| |
* | Fix return commentLeonid Logvinov2017-06-221-1/+1
| |
* | Return filledAmount from fillOrderAsyncLeonid Logvinov2017-06-211-1/+6
|/
* Rename Log*Args to Log*ContractEventArgsLeonid Logvinov2017-06-212-5/+5
|
* Fall back to import x = require() syntaxLeonid Logvinov2017-06-2110-23/+23
|
* Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-2110-60/+73
|
* Add missing semi-colonFabio Berger2017-06-201-1/+1
|
* Add newline between type defsFabio Berger2017-06-201-0/+1
|
* Improve commentFabio Berger2017-06-201-3/+3
|
* Fix tslint issueFabio Berger2017-06-191-1/+2
|
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-195-14/+53
|\
| * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-193-7/+7
| |
| * Merge branch 'master' into event-typesLeonid2017-06-154-11/+17
| |\
| | * Switch back to using Web3.Provider, not Web3Provider in internal classesLeonid Logvinov2017-06-151-4/+3
| | |
| | * Add explaining comment for the web3Provider typeLeonid Logvinov2017-06-151-1/+5
| | |
| | * Make ZeroEx constructor accept Web3Provider instead of Web3 instanceLeonid Logvinov2017-06-154-13/+16
| | |
| * | Add actual type for contract event argumentsLeonid Logvinov2017-06-153-2/+36
| |/
| * Remove unused importLeonid Logvinov2017-06-151-1/+0
| |
* | Add and improve commentsFabio Berger2017-06-164-17/+43
|/
* Remove types that are not used in public interface from export and rename ↵Leonid Logvinov2017-06-143-16/+12
| | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues
* Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-133-14/+14
|
* Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
|
* Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-134-18/+35
|
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-131-0/+9
|
* Export DoneCallbackLeonid Logvinov2017-06-131-0/+1
|
* Introduce index.ts file which defines public interfaceLeonid Logvinov2017-06-131-0/+24
|
* Change main file name from 0x.js.ts to 0x.tsLeonid Logvinov2017-06-121-0/+0
|
* Duplicate truffle contracts typesLeonid Logvinov2017-06-112-1/+9
|
* Add type referencesLeonid Logvinov2017-06-111-0/+2
|
* Merge branch 'master' into privateLeonid2017-06-115-36/+85
|\
| * Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-114-0/+49
| |\ | | | | | | Add initial error handling decorator implementation
| | * Merge branch 'master' into error-decoratorLeonid2017-06-104-24/+139
| | |\
| | * | Add initial error handling decorator implementationLeonid Logvinov2017-06-104-0/+49
| | | |
| * | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-102-36/+36
| | |/ | |/|
* | | Fix last testsLeonid Logvinov2017-06-113-20/+20
| | |
* | | Prefix private vars with _Leonid Logvinov2017-06-105-129/+130
|/ /
* | Align all param comments so that they are more readableFabio Berger2017-06-104-87/+99
| |
* | Add param & return comments to all public methods and add comments to some ↵Fabio Berger2017-06-104-24/+127
|/ | | | public methods that were missing them
* Merge branch 'master' into json-schemaLeonid2017-06-106-8/+18
|\
| * Merge branch 'master' into schema-testsLeonid2017-06-102-4/+3
| |\
| * | Fix bugs in schemasLeonid Logvinov2017-06-103-3/+3
| | |
| * | Merge branch 'master' into schema-testsLeonid2017-06-101-5/+4
| |\ \
| * \ \ Merge branch 'master' into schema-testsLeonid2017-06-094-5/+87
| |\ \ \
| * \ \ \ Merge branch 'master' into schema-testsLeonid2017-06-093-16/+36
| |\ \ \ \
| * | | | | Fix testsLeonid Logvinov2017-06-091-2/+9
| | | | | |
| * | | | | Add tests for TokenSchemaLeonid Logvinov2017-06-092-4/+7
| | | | | |
| * | | | | Add ecSignatureSchema testsLeonid Logvinov2017-06-091-1/+1
| | | | | |
* | | | | | Merge branch 'master' into json-schemaLeonid2017-06-102-4/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Move MAX_DIGITS_IN_UNSIGNED_256_INT to constantsFabio Berger2017-06-102-4/+3
| | |_|_|/ | |/| | |
* | | | | Fix testsLeonid Logvinov2017-06-101-2/+1
| | | | |
* | | | | Address feedbackLeonid Logvinov2017-06-102-9/+6
| | | | |
* | | | | Fix testLeonid Logvinov2017-06-101-8/+5
| | | | |
* | | | | Merge branch 'master' into json-schemaLeonid2017-06-101-5/+4
|\| | | |
| * | | | Merge branch 'master' into async-bugLeonid2017-06-096-21/+123
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use for ofLeonid Logvinov2017-06-091-2/+2
| | | | |
| * | | | Fix the bug of not awaiting an async functionLeonid Logvinov2017-06-091-4/+3
| | |/ / | |/| |
* | | | Merge branch 'master' into json-schemaLeonid2017-06-094-5/+87
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-093-16/+36
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-092-6/+3
| | | |
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-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-096-38/+128
| |\ \ \
| * | | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-7/+7
| | | | |
| * | | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-082-0/+73
| | | | |
* | | | | Fix tests one moreLeonid Logvinov2017-06-091-1/+1
| | | | |
* | | | | Fix testsLeonid Logvinov2017-06-091-1/+1
| | | | |
* | | | | Merge branch 'master' into json-schemaLeonid2017-06-093-12/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
| | |_|/ | |/| |
* | | | Make static function publicLeonid Logvinov2017-06-092-2/+1
| | | |
* | | | Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-092-22/+11
| |/ / |/| |
* | | Remove isSenderAddressAvailableAsyncLeonid Logvinov2017-06-091-4/+0
|/ /
* | 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-095-18/+33
| | | | | | | | over the requests and validating them individually
* | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-094-34/+111
|\| | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
| * Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-082-9/+9
| |\ | | | | | | Interface tweaks
| | * Merge branch 'master' into interfaceTweaksLeonid2017-06-081-0/+6
| | |\
| | * | Make web3Wrapper protected instead of publicFabio Berger2017-06-081-1/+1
| | | |
| | * | 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-081-2/+2
| |\ \ \ | | | | | | | | | | Refactor isValidSignature
| | * \ \ Merge branch 'master' into is-valid-signature-contractLeonid2017-06-081-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Remove unused importLeonid Logvinov2017-06-081-1/+0
| | | | |
| | * | | Move isValidSignature back from utilsLeonid Logvinov2017-06-082-16/+13
| | | | |
| | * | | Refactor isValidSignatureLeonid Logvinov2017-06-083-15/+19
| | | |/ | | |/|
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-081-9/+12
| | | |
| * | | 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-083-30/+119
| |\ \ \ | | | |/ | | |/|
| * | | Don't use batchFillOrderAsync for fillOrderAsyncLeonid Logvinov2017-06-081-3/+37
| | | |
| * | | Add no-op testLeonid Logvinov2017-06-081-1/+3
| | | |
| * | | 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
| |\ \ \
| * \ \ \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-072-17/+24
| |\ \ \ \
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| | | | | |
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| | | | | |
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-072-3/+3
| | | | | |
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-072-0/+51
| | | | | |
| * | | | | 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
| | | | | |
* | | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-082-2/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts
| * | | | Address feedbackLeonid Logvinov2017-06-081-6/+9
| | | | |
| * | | | 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-083-12/+69
| |\ \ \ \
| * | | | | Fix linter errorLeonid Logvinov2017-06-071-1/+1
| | | | | |
| * | | | | Address feedbackLeonid Logvinov2017-06-072-8/+12
| | |_|_|/ | |/| | |
| * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-073-23/+24
| | | |
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-072-3/+3
| | | |
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-073-0/+57
| | | |
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-082-7/+81
| |/ / |/| |
* | | 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-072-6/+6
| | |
* | | Spacing fixFabio Berger2017-06-071-2/+1
| | |
* | | remove unused argFabio Berger2017-06-071-2/+1
| | |
* | | remove spaceFabio Berger2017-06-071-1/+0
| | |
* | | merge masterFabio Berger2017-06-074-44/+108
|\| |
| * | 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
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-072-4/+4
| |
| * Make txOpts optionalLeonid Logvinov2017-06-071-7/+7
| |
| * Address feedbackLeonid Logvinov2017-06-074-45/+58
| |
| * Add missing semicolonLeonid Logvinov2017-06-061-1/+1
| |
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-062-31/+39
| |
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-062-1/+9
| |
| * Merge branch 'master' into cancelAsyncLeonid Logvinov2017-06-061-2/+3
| |\
| * | Fix testsLeonid Logvinov2017-06-061-1/+1
| | |
| * | Add initial implementation with success testLeonid Logvinov2017-06-062-1/+58
| | |
* | | Implement fillOrKill & testsFabio Berger2017-06-076-45/+131
| |/ |/|
* | avoid newline issues by putting the assertion message on a single lineFabio Berger2017-06-061-2/+3
|/
* Merge pull request #39 from 0xProject/senderAccountLeonid2017-06-066-66/+38
|\ | | | | Make methods accept senderAccount
| * Address feedbackLeonid Logvinov2017-06-063-5/+5
| |
| * Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-064-6/+7
| |
| * Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-064-13/+13
| |
| * Rename senderAddress to signerAddressLeonid Logvinov2017-06-061-4/+4
| |
| * Use variable name in assertin messageLeonid Logvinov2017-06-061-3/+4
| |
| * Rename accounts to addresesLeonid Logvinov2017-06-063-10/+10
| |
| * Rename senderAccount to senderAddressLeonid Logvinov2017-06-064-23/+23
| |
| * Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-064-6/+6
| |
| * Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
| |
| * Remove redundant reassignmentLeonid Logvinov2017-06-061-3/+2
| |
| * Fix commentsLeonid Logvinov2017-06-061-1/+1
| |
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| |
| * Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-063-7/+8
| |
| * Make methods accept senderAccountLeonid Logvinov2017-06-056-68/+38
| |
* | Add tests to number regex and BigNumber serialization & fix bugsLeonid Logvinov2017-06-051-1/+1
|/
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-0310-568/+131
|\ | | | | 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
| |
| * Update artifactsFabio Berger2017-06-036-566/+35
| |
| * Revert unintentional artifact changesFabio Berger2017-06-036-35/+566
| |
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-52/+126
| |\ | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-4/+14
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts
| * | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵Fabio Berger2017-06-024-3/+91
| | | | | | | | | | | | | | | | if user updates the provider
| * | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-023-4/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| * | | | Update artifactsFabio Berger2017-06-026-561/+30
| | | | |
* | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-036-9/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts
| * \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-034-56/+126
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-023-7/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| * | | | 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-021-3/+9
| | | | | | | | | | | | | | | | | | | | 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-023-4/+9
| |\ \ \ \
| * | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| | | | | |
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-023-5/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-029-69/+329
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-012-1/+17
| |\ \ \ \ \ \ \
| * | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵Fabio Berger2017-06-012-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync
| * | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHashFabio Berger2017-06-013-4/+12
| | | | | | | | |
* | | | | | | | | Fix bugFabio Berger2017-06-031-1/+1
| | | | | | | | |
* | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
| | | | | | | | |
* | | | | | | | | Add missing async suffixFabio Berger2017-06-032-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-039-77/+451
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts
| * | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-032-59/+66
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-031-5/+6
| | | | | | | | | |
| | * | | | | | | | Address feedbackLeonid Logvinov2017-06-032-20/+20
| | | | | | | | | |
| | * | | | | | | | Allign argumentsLeonid Logvinov2017-06-031-3/+3
| | | | | | | | | |
| | * | | | | | | | Rewrite commentLeonid Logvinov2017-06-031-5/+11
| | | | | | | | | |
| | * | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-032-22/+15
| | | | | | | | | |
| | * | | | | | | | Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| | | | | | | | | |
| | * | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-022-2/+2
| | | | | | | | | |
| | * | | | | | | | Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| | | | | | | | | |
| | * | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-022-2/+2
| | | | | | | | | |
| | * | | | | | | | 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 commentFabio Berger2017-06-031-1/+1
| |/ / / / / / / /
| * | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-022-16/+16
| | | | | | | | |
| * | | | | | | | 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
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-022-9/+52
| | | | | | | | | |
| * | | | | | | | | Add ProtocolTokenArtifactsLeonid Logvinov2017-06-021-0/+321
| | | | | | | | | |
| * | | | | | | | | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-022-0/+21
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Validate maker balance and allowance & testsLeonid Logvinov2017-06-021-4/+14
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵Fabio Berger2017-06-022-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined if non available
| * | | | | | | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-0/+3
| | | | | | | |
| * | | | | | | Introduce coinBase accountLeonid Logvinov2017-06-022-0/+9
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test
| * | | | | | Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-023-5/+11
| | |_|_|_|/ | |/| | | |
| * | | | | Make validateFillOrder asyncronousLeonid Logvinov2017-06-021-2/+2
| | | | | |
| * | | | | Add not enough taker balance testsLeonid Logvinov2017-06-023-4/+20
| | |_|_|/ | |/| | |
| * | | | Fix importFabio Berger2017-06-011-1/+1
| | | | |
| * | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵Fabio Berger2017-06-011-28/+41
| | | | | | | | | | | | | | | | | | | | artifacts
| * | | | rename txData to txOptsFabio Berger2017-06-011-2/+2
| | | | |
| * | | | remove superfluous paramFabio Berger2017-06-011-1/+1
| | | | |
| * | | | remove unused argFabio Berger2017-06-011-2/+1
| | | | |
| * | | | remove unneeded methodFabio Berger2017-06-011-5/+1
| | | | |
| * | | | improve commentFabio Berger2017-06-011-2/+2
| | | | |
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-012-0/+4
| |\ \ \ \
| | * | | | Add expired checkLeonid Logvinov2017-06-011-0/+3
| | | | | |
| | * | | | Add EXPIRED error typeLeonid Logvinov2017-06-011-0/+1
| | | | | |
| * | | | | Add comment for fillOrderAsync method, rename fillAmount to ↵Fabio Berger2017-06-011-6/+11
| |/ / / / | | | | | | | | | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 17:38:44 +0800