aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
Commit message (Collapse)AuthorAgeFilesLines
* Convert artifacts addresses lo lower case before usingLeonid Logvinov2017-08-242-2/+2
|
* Rename _getTokenByMetadata to _createTokenFromMetadataLeonid Logvinov2017-08-241-4/+4
|
* Remove redundant else'sLeonid Logvinov2017-08-241-4/+2
|
* Add tests for tokenRegistry public gettersLeonid Logvinov2017-08-241-1/+1
|
* Add all public tokenRegistry functionsLeonid Logvinov2017-08-241-0/+38
|
* Add zeroEx.tokenRegistry.getTokenAddressesAsync()Leonid Logvinov2017-08-241-1/+10
|
* Fix commentsLeonid Logvinov2017-08-241-5/+7
|
* Add a comment for isRoundingErrorAsyncLeonid Logvinov2017-08-241-5/+12
|
* Remove And's from namesLeonid Logvinov2017-08-241-17/+17
|
* Move order validation functions to orderValidationUtils and make ↵Leonid Logvinov2017-08-241-51/+26
| | | | isRoundingError public
* Add initial implementation for public order validation functionsLeonid Logvinov2017-08-241-48/+77
|
* Merge pull request #131 from 0xProject/addTokenRegistryMethodFabio Berger2017-08-241-12/+26
|\ | | | | Add public method to TokenRegistry
| * rename method for clarity since we return a Token and not tokenMetadataFabio Berger2017-08-241-2/+2
| |
| * Add assertion to public methodFabio Berger2017-08-241-0/+3
| |
| * Add public method `getTokenMetadataIfExistsAsync` to TokenRegistry wrapper, ↵Fabio Berger2017-08-231-12/+23
| | | | | | | | refactor `getTokensAsync` to use `getTokenMetadataIfExistsAsync` under the hood and added unit tests
* | Return variable instead of expressionFabio Berger2017-08-232-2/+4
| |
* | Add getContractAddressAsync public method to proxy instanceFabio Berger2017-08-231-0/+9
|/
* Fix the docs for shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-08-221-4/+6
|
* Rename internally Proxy to TokenTransferProxyLeonid Logvinov2017-08-222-41/+41
|
* Update artifacts and rename proxy to tokenTransferProxyFabio Berger2017-08-212-4/+4
|
* Merge pull request #118 from 0xProject/artifacts-updateFabio Berger2017-08-212-4/+3
|\ | | | | Update artifacts with the latest mainnet version
| * Remove url from token registryLeonid Logvinov2017-08-151-2/+1
| |
| * Update Exchange artifacts and adjust ExchangeWrapperLeonid Logvinov2017-08-151-2/+2
| |
* | remove unnecessary assertion and add regression testFabio Berger2017-08-171-1/+0
| |
* | remove unneeded assertion from _isRoundingErrorAsync since one can make ↵Fabio Berger2017-08-171-1/+0
| | | | | | | | static calls without an available address
* | Remove isUserAddressAvailable assertion from getBalanceAsync and add ↵Fabio Berger2017-08-171-1/+0
|/ | | | regression test
* Store tokenWrapper inside of OrdervalidationUtilsLeonid Logvinov2017-07-261-2/+4
|
* Remove and from namesLeonid Logvinov2017-07-261-1/+1
|
* Remove unused importsLeonid Logvinov2017-07-263-8/+0
|
* Refactor OrderValidationUtils to check for the case when ZRX is one of the ↵Leonid Logvinov2017-07-261-2/+2
| | | | tokens traded
* Pass tokenWrapper to ↵Leonid Logvinov2017-07-261-1/+1
| | | | validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync
* Move _validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync to ↵Leonid Logvinov2017-07-261-63/+4
| | | | orderValidationUtils
* Add forgotten meger conflict resolutionLeonid Logvinov2017-07-121-19/+0
|
* Use PascalCase names as string enum keysLeonid Logvinov2017-07-124-35/+63
|
* Fix the commentLeonid Logvinov2017-07-121-1/+3
|
* Migrate to using a single Exchange contractLeonid Logvinov2017-07-122-71/+40
|
* Fix a typoLeonid Logvinov2017-07-111-4/+4
|
* Fix a typo in commentLeonid Logvinov2017-07-111-2/+2
|
* Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-07-111-10/+11
|
* Change arguments order at isRoundingErrorLeonid Logvinov2017-07-111-3/+3
|
* Migrate eventsLeonid Logvinov2017-07-111-3/+4
|
* Migrate fillOrKillOrderLeonid Logvinov2017-07-111-9/+9
|
* Migrate ZRX_TOKEN_AMOUNTLeonid Logvinov2017-07-111-1/+1
|
* Migrate getUnavailableTakerTokenAmountLeonid Logvinov2017-07-111-3/+3
|
* Migrate batchFillOrKillOrdersLeonid Logvinov2017-07-111-5/+5
|
* Migrate batchFillOrdersLeonid Logvinov2017-07-111-16/+20
|
* Migrate fillOrderLeonid Logvinov2017-07-111-20/+23
|
* Migrate fillOrdersUpTo and remove minLeonid Logvinov2017-07-111-13/+14
|
* Migrate batchCancelOrdersLeonid Logvinov2017-07-111-5/+5
|
* Migrate cencelOrderLeonid Logvinov2017-07-111-9/+9
|
* Revert "Migrate isRoundingError parameter changes"Leonid Logvinov2017-07-111-5/+5
| | | | This reverts commit 9a200c67210599faf5eb735893abae99f72a4d1f.
* Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"Leonid Logvinov2017-07-111-1/+1
| | | | This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf.
* Migrate isRoundingError parameter changesLeonid Logvinov2017-07-111-5/+5
|
* Rename ZRX to ZRX_TOKEN_CONTRACTLeonid Logvinov2017-07-111-1/+1
|
* Rename batchCancelOrderAsync to batchCancelOrdersAsyncLeonid Logvinov2017-07-081-1/+1
|
* Rename batchFillOrderAsync to batchFillOrdersAsyncLeonid Logvinov2017-07-081-2/+2
|
* Move zeroEx.exchange.getAvailableContractAddressesAsync to ↵Leonid Logvinov2017-07-061-45/+2
| | | | zeroEx.getAvailableExchangeContractAddressesAsync and zeroEx.exchange.getProxyAuthorizedContractAddressesAsync to zeroEx.getProxyAuthorizedExchangeContractAddressesAsync
* move order hash schema to a separate fileLeonid Logvinov2017-07-051-1/+2
|
* Fix the bug when didn't invalidate etherToken contract instanceLeonid Logvinov2017-07-051-0/+3
|
* Make this.proxy.invalidateContractInstance and ↵Leonid Logvinov2017-07-052-6/+6
| | | | this.tokenRegistry.invalidateContractInstance private
* Make invalidateContractInstancesAsync private on exchange and tokenLeonid Logvinov2017-07-052-8/+8
|
* Add parameter validation for subscribeAsyncLeonid Logvinov2017-07-052-0/+10
|
* Use orderHashSchema to validate order hashLeonid Logvinov2017-07-051-4/+4
|
* Refactor event testsLeonid Logvinov2017-07-051-4/+0
|
* Add tests for order hash SchemaLeonid Logvinov2017-07-051-0/+6
|
* Fix commentsLeonid Logvinov2017-07-041-5/+4
|
* Merge branch 'master' into subscribe-tokenLeonid2017-07-042-5/+15
|\
| * Merge pull request #89 from 0xProject/proxyLeonid2017-07-042-5/+15
| |\ | | | | | | Add zeroEx.proxy
| | * Use call instead of use in the commentsLeonid Logvinov2017-07-042-6/+6
| | |
| | * Fix the commentLeonid Logvinov2017-07-041-1/+1
| | |
| | * Add zeroEx.proxy.getAuthorizedAddressesAsync and testsLeonid Logvinov2017-07-041-0/+10
| | |
* | | Add initial implementation and tests for zeroEx.token.subscribeAsyncLeonid Logvinov2017-07-042-34/+57
|/ /
* | Rename _wrapEventCallback to _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-041-2/+2
| |
* | Merge branch 'master' into wrap-log-bignumberLeonid2017-07-042-61/+178
|\|
| * Stop passing exchangeContractAddress to utils.getOrderHashHexLeonid Logvinov2017-07-041-7/+2
| |
| * Await ZRX callLeonid Logvinov2017-07-041-1/+1
| |
| * Fix the commentLeonid Logvinov2017-07-041-1/+1
| |
| * Rename invalidateContractInstanceAsync to invalidateContractInstancesAsyncLeonid Logvinov2017-07-041-1/+1
| |
| * Fix _getProxyContractAsync function nameLeonid Logvinov2017-07-041-2/+2
| |
| * Fix commentLeonid Logvinov2017-07-041-1/+1
| |
| * Fix commentLeonid Logvinov2017-07-011-1/+1
| |
| * Remove constructorLeonid Logvinov2017-07-011-3/+0
| |
| * Fix proxy commentLeonid Logvinov2017-07-011-1/+1
| |
| * Fix namingLeonid Logvinov2017-07-011-2/+3
| |
| * Fix a typo in authorizedLeonid Logvinov2017-07-011-3/+3
| |
| * Fix a bug in getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-07-011-2/+7
| |
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-07-011-1/+1
| |
| * Fix a typo in authorizedLeonid Logvinov2017-06-301-1/+1
| |
| * Implement getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+16
| |
| * Store ProxyWrapper instance in ExchangeWrapperLeonid Logvinov2017-06-301-1/+4
| |
| * Add Proxy wrapperLeonid Logvinov2017-06-301-0/+36
| |
| * Factor out ZRXtokenAddress variableLeonid Logvinov2017-06-301-1/+2
| |
| * Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ↵Leonid Logvinov2017-06-301-1/+1
| | | | | | | | ZeroExError.EXCHANGE_CONTRACT_DOES_NOT_EXIST
| * Fix a typo in a nameLeonid Logvinov2017-06-301-2/+2
| |
| * Factor out exchangeArtifacts variableLeonid Logvinov2017-06-301-1/+2
| |
| * Check that artefacts by networkId are not undefined before getting the addressLeonid Logvinov2017-06-301-2/+5
| |
| * Fix a typo in a nameLeonid Logvinov2017-06-301-1/+1
| |
| * Fix a typo in a nameLeonid Logvinov2017-06-301-1/+1
| |
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-2/+2
| |
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| |
| * Mve schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| |
| * Allow multiple exchange versions t be functional at the same timeLeonid Logvinov2017-06-271-48/+107
| |
| * Move exchange artifacts to an exchange subfolderLeonid Logvinov2017-06-271-1/+1
| |
* | Check for a BigNumber instanceLeonid Logvinov2017-07-041-1/+8
| |
* | Use _.isString instead of instanceofLeonid Logvinov2017-07-041-1/+1
| |
* | Wrap all event args in a newer version of BigNumber and test itLeonid Logvinov2017-07-021-1/+19
|/
* Additional EtherToken comment changesFabio Berger2017-06-271-10/+10
|
* Improve EtherToken commentsFabio Berger2017-06-271-10/+10
|
* refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ↵Fabio Berger2017-06-271-2/+1
| | | | 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-271-1/+1
|
* Implement EtherTokenWrapper and tests, with deposit and withdraw methodsFabio Berger2017-06-261-0/+76
|
* Add missing return commentFabio Berger2017-06-261-0/+1
|
* Fix incorrect merge consequencesLeonid Logvinov2017-06-231-3/+3
|
* Merge branch 'master' into fill-order-amuontLeonid2017-06-234-44/+37
|\
| * Revert "Use different lodash import syntax which allows to include only used ↵Leonid2017-06-224-43/+37
| | | | | | | | 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
|/
* Fall back to import x = require() syntaxLeonid Logvinov2017-06-214-10/+10
|
* Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-214-37/+43
|
* Add missing semi-colonFabio Berger2017-06-201-1/+1
|
* Improve commentFabio Berger2017-06-201-3/+3
|
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-191-1/+2
|\
| * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-191-2/+2
| |
| * Add actual type for contract event argumentsLeonid Logvinov2017-06-151-1/+2
| |
* | Add and improve commentsFabio Berger2017-06-163-12/+25
|/
* Remove types that are not used in public interface from export and rename ↵Leonid Logvinov2017-06-141-7/+7
| | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues
* Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-131-12/+12
|
* Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
|
* Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-131-16/+27
|
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-131-0/+9
|
* Duplicate truffle contracts typesLeonid Logvinov2017-06-111-1/+1
|
* Merge branch 'master' into privateLeonid2017-06-111-14/+22
|\
| * Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-111-0/+8
| |\ | | | | | | Add initial error handling decorator implementation
| | * Merge branch 'master' into error-decoratorLeonid2017-06-103-12/+93
| | |\
| | * | Add initial error handling decorator implementationLeonid Logvinov2017-06-101-0/+8
| | | |
| * | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-101-14/+14
| | |/ | |/|
* | | Fix last testsLeonid Logvinov2017-06-113-20/+20
| | |
* | | Prefix private vars with _Leonid Logvinov2017-06-104-116/+117
|/ /
* | Align all param comments so that they are more readableFabio Berger2017-06-103-64/+76
| |
* | Add param & return comments to all public methods and add comments to some ↵Fabio Berger2017-06-103-12/+81
|/ | | | public methods that were missing them
* Address feedbackLeonid Logvinov2017-06-101-1/+1
|
* Fix testLeonid Logvinov2017-06-101-8/+5
|
* Merge branch 'master' into json-schemaLeonid2017-06-101-5/+4
|\
| * Merge branch 'master' into async-bugLeonid2017-06-091-20/+83
| |\
| * | 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-091-4/+71
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+12
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-091-5/+2
| | | |
| * | | Add signedOrdersScxhemaLeonid Logvinov2017-06-091-0/+4
| | | |
| * | | Address feedbackLeonid Logvinov2017-06-091-1/+1
| | | |
| * | | Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-091-6/+6
| | | |
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-24/+89
| |\ \ \ | | | |/ | | |/|
| * | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-7/+7
| | | |
| * | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-081-0/+66
| | | |
* | | | Fix tests one moreLeonid Logvinov2017-06-091-1/+1
| | | |
* | | | Fix testsLeonid Logvinov2017-06-091-1/+1
| | | |
* | | | Merge branch 'master' into json-schemaLeonid2017-06-091-12/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-091-16/+12
| | |/ | |/|
* | | Make static function publicLeonid Logvinov2017-06-091-1/+0
| | |
* | | Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-091-19/+7
|/ /
* | 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-091-4/+5
| | | | | | | | over the requests and validating them individually
* | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-092-26/+92
|\| | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
| * Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-081-1/+1
| |\ | | | | | | Interface tweaks
| | * Merge branch 'master' into interfaceTweaksLeonid2017-06-081-0/+6
| | |\
| | * | Make web3Wrapper protected instead of publicFabio Berger2017-06-081-1/+1
| | | |
| * | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Refactor isValidSignatureLeonid Logvinov2017-06-081-2/+2
| | | |/ | | |/|
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-081-9/+12
| | | |
| * | | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| | | |
| * | | Address old feedbackLeonid Logvinov2017-06-081-2/+3
| | | |
| * | | Fix spacingLeonid Logvinov2017-06-081-2/+2
| | | |
| * | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-081-25/+106
| |\ \ \ | | | |/ | | |/|
| * | | 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-071-27/+3
| |\ \ \
| * \ \ \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-17/+19
| |\ \ \ \
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| | | | | |
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| | | | | |
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| | | | | |
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
| | | | | |
| * | | | | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| | | | | |
| * | | | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-071-21/+43
| | | | | |
* | | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-2/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | # 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-081-7/+57
| |\ \ \ \
| * | | | | Address feedbackLeonid Logvinov2017-06-071-8/+11
| | |_|_|/ | |/| | |
| * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-071-17/+19
| | | |
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| | | |
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
| | | |
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-081-7/+70
| |/ / |/| |
* | | Remove catch of invalid jump throws since there are many reasons the ↵Fabio Berger2017-06-071-24/+14
| | | | | | | | | | | | contracts could throw this error
* | | add `hex` to function and variable name for clarityFabio Berger2017-06-071-4/+4
| | |
* | | remove unused argFabio Berger2017-06-071-2/+1
| | |
* | | merge masterFabio Berger2017-06-071-31/+79
|\| |
| * | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-071-2/+2
| |
| * Address feedbackLeonid Logvinov2017-06-071-16/+15
| |
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-061-31/+35
| |
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-061-1/+7
| |
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| |
| * Add initial implementation with success testLeonid Logvinov2017-06-061-1/+52
| |
* | Implement fillOrKill & testsFabio Berger2017-06-071-17/+88
|/
* Address feedbackLeonid Logvinov2017-06-062-3/+3
|
* Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-062-0/+3
|
* Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-062-4/+4
|
* Rename senderAccount to senderAddressLeonid Logvinov2017-06-062-13/+13
|
* Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-062-4/+4
|
* Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
|
* Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-062-4/+4
|
* Make methods accept senderAccountLeonid Logvinov2017-06-052-27/+19
|
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-031-1/+46
|\ | | | | Implement zeroEx.exchange.subscribeAsync
| * Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| |
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-031-31/+98
| |\ | | | | | | | | | | | | | | | | | | # 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-021-1/+45
| | | | | | | | | | | | | | | | if user updates the provider
| * | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
* | \ \ \ Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-032-2/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts
| * \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-031-31/+98
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts
| * | | | 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-021-3/+4
| |\ \ \ \
| * | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| | | | | |
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-7/+106
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-011-1/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵Fabio Berger2017-06-011-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync
* | | | | | | | | Fix bugFabio Berger2017-06-031-1/+1
| | | | | | | | |
* | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-031-8/+201
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts
| * | | | | | | | Address feedbackLeonid Logvinov2017-06-031-12/+12
| | | | | | | | |
| * | | | | | | | Allign argumentsLeonid Logvinov2017-06-031-3/+3
| | | | | | | | |
| * | | | | | | | Rewrite commentLeonid Logvinov2017-06-031-5/+11
| | | | | | | | |
| * | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-031-13/+12
| | | | | | | | |
| * | | | | | | | Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| | | | | | | | |
| * | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-021-1/+1
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 23:28:35 +0800