aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update artifacts and rename proxy to tokenTransferProxyFabio Berger2017-08-216-216/+247
|
* Merge pull request #118 from 0xProject/artifacts-updateFabio Berger2017-08-219-515/+399
|\ | | | | Update artifacts with the latest mainnet version
| * Remove url from token registryLeonid Logvinov2017-08-153-17/+4
| |
| * Update testrpc artifactsLeonid Logvinov2017-08-153-3/+3
| |
| * --no-editLeonid Logvinov2017-08-151-1/+1
| |
| * Update Exchange artifacts and adjust ExchangeWrapperLeonid Logvinov2017-08-153-94/+89
| |
| * Update TokenRegistry artifactsLeonid Logvinov2017-08-151-205/+245
| |
| * Update EtherToken artifactsLeonid Logvinov2017-08-151-8/+59
| |
| * Update Token artifactsLeonid Logvinov2017-08-151-2/+2
| |
| * Remove Mintable artifactsLeonid Logvinov2017-08-151-189/+0
| |
* | Add JSONRPCPayload type and remove unused importLeonid Logvinov2017-08-172-3/+8
| |
* | 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-172-1/+25
|/ | | | regression test
* Simplify order checksLeonid Logvinov2017-07-261-30/+18
|
* Store tokenWrapper inside of OrdervalidationUtilsLeonid Logvinov2017-07-262-23/+29
|
* Remove and from namesLeonid Logvinov2017-07-262-6/+6
|
* Remove unused importsLeonid Logvinov2017-07-266-11/+0
|
* Cover all possible branches of order validation errors with testsLeonid Logvinov2017-07-261-11/+8
|
* Refactor OrderValidationUtils to check for the case when ZRX is one of the ↵Leonid Logvinov2017-07-262-55/+81
| | | | tokens traded
* Pass tokenWrapper to ↵Leonid Logvinov2017-07-262-12/+12
| | | | validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync
* Move _validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync to ↵Leonid Logvinov2017-07-262-63/+70
| | | | orderValidationUtils
* Add ethereumjs-utils typesLeonid Logvinov2017-07-221-11/+0
|
* Add bn.js typesLeonid Logvinov2017-07-222-2/+1
|
* Add a comment explaining anyLeonid Logvinov2017-07-121-1/+2
|
* Add forgotten meger conflict resolutionLeonid Logvinov2017-07-121-19/+0
|
* Use PascalCase names as string enum keysLeonid Logvinov2017-07-129-87/+114
|
* Migrate to using native string enumsLeonid Logvinov2017-07-121-67/+50
|
* Make getOrderHashHex staticLeonid Logvinov2017-07-121-10/+10
|
* Fix the commentLeonid Logvinov2017-07-121-1/+3
|
* Migrate to using a single Exchange contractLeonid Logvinov2017-07-123-110/+40
|
* Remove exchange artifacts by nameLeonid Logvinov2017-07-121-6/+0
|
* Flatten artifactsLeonid Logvinov2017-07-121-0/+0
|
* Add the source for the schemaLeonid2017-07-121-0/+1
|
* Use custom Schema typesLeonid Logvinov2017-07-122-14/+13
|
* Add jsonschema Schema declarationLeonid Logvinov2017-07-121-0/+48
|
* 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
|
* Simplify BigNumber hackLeonid Logvinov2017-07-111-5/+2
|
* Migrate the rest of the artifactsLeonid Logvinov2017-07-111-184/+40
|
* Change arguments order at isRoundingErrorLeonid Logvinov2017-07-111-3/+3
|
* Migrate eventsLeonid Logvinov2017-07-113-23/+24
|
* Migrate constructor argumentsLeonid Logvinov2017-07-111-2/+2
|
* Migrate fillOrKillOrderLeonid Logvinov2017-07-113-14/+15
|
* Migrate ZRX_TOKEN_AMOUNTLeonid Logvinov2017-07-113-3/+3
|
* Migrate getUnavailableTakerTokenAmountLeonid Logvinov2017-07-113-6/+6
|
* Migrate PROXY_CONTRACTLeonid Logvinov2017-07-111-1/+1
|
* Migrate batchFillOrKillOrdersLeonid Logvinov2017-07-113-10/+11
|
* Migrate batchFillOrdersLeonid Logvinov2017-07-113-24/+31
|
* Migrate fillOrderLeonid Logvinov2017-07-113-29/+35
|
* Migrate fillOrdersUpTo and remove minLeonid Logvinov2017-07-113-44/+26
|
* Migrate batchCancelOrdersLeonid Logvinov2017-07-113-10/+11
|
* Migrate getPartialAmountLeonid Logvinov2017-07-111-3/+3
|
* Migrate cencelOrderLeonid Logvinov2017-07-113-15/+16
|
* Revert "Migrate isRoundingError parameter changes"Leonid Logvinov2017-07-113-9/+9
| | | | This reverts commit 9a200c67210599faf5eb735893abae99f72a4d1f.
* Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"Leonid Logvinov2017-07-113-28/+2
| | | | This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf.
* Update binaries and timestampsLeonid Logvinov2017-07-111-4/+4
|
* Migrate isRoundingError parameter changesLeonid Logvinov2017-07-113-9/+9
|
* Rename ZRX to ZRX_TOKEN_CONTRACTLeonid Logvinov2017-07-113-2/+28
|
* Add contracts artifacts for contracts that didn't changeLeonid Logvinov2017-07-115-13/+17
|
* Merge pull request #100 from 0xProject/improveSignOrderFabio Berger2017-07-082-29/+48
|\ | | | | Improve signOrderHashAsync
| * Move private helper methods into signatureUtils so that they don't show up ↵Fabio Berger2017-07-082-24/+30
| | | | | | | | in the ZeroEx classes auto-complete list
| * Remove duplication of 27, 28 v valuesFabio Berger2017-07-081-4/+5
| |
| * Modify signOrderHashAsync to parse the signatureHex string as V + R + S AND ↵Fabio Berger2017-07-081-29/+41
| | | | | | | | R + S + V and check both for a valid signature in order to fix the issue of different nodes returning it differently
* | Refactor net_version caching logicLeonid Logvinov2017-07-081-10/+10
| |
* | Merge branch 'master' into cache_net_versionLeonid2017-07-081-3/+3
|\ \
| * | Rename batchCancelOrderAsync to batchCancelOrdersAsyncLeonid Logvinov2017-07-081-1/+1
| | |
| * | Rename batchFillOrderAsync to batchFillOrdersAsyncLeonid Logvinov2017-07-081-2/+2
| |/
* / Cache networkId in web3WrapperLeonid Logvinov2017-07-071-5/+12
|/
* Inline _isExchangeContractAddressProxyAuthorizedAsyncLeonid Logvinov2017-07-071-5/+1
|
* Fix comments to use web3 provider instead of web3 instanceLeonid Logvinov2017-07-072-7/+8
|
* Move zeroEx.exchange.getAvailableContractAddressesAsync to ↵Leonid Logvinov2017-07-062-46/+45
| | | | zeroEx.getAvailableExchangeContractAddressesAsync and zeroEx.exchange.getProxyAuthorizedContractAddressesAsync to zeroEx.getProxyAuthorizedExchangeContractAddressesAsync
* Add order hash schemaLeonid Logvinov2017-07-051-0/+5
|
* Rearrange methods in event utilsLeonid Logvinov2017-07-051-13/+13
|
* Add underscore in front of _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-051-2/+2
|
* Use string templateLeonid Logvinov2017-07-051-1/+1
|
* Make all fields of subscriptionOpts schema optionalLeonid Logvinov2017-07-051-1/+0
|
* move order hash schema to a separate fileLeonid Logvinov2017-07-054-9/+6
|
* Fix order schema (add exchangeContractAddress)Leonid Logvinov2017-07-051-1/+2
|
* Fix the bug when didn't invalidate etherToken contract instanceLeonid Logvinov2017-07-052-0/+4
|
* Make this.proxy.invalidateContractInstance and ↵Leonid Logvinov2017-07-053-8/+8
| | | | this.tokenRegistry.invalidateContractInstance private
* Make invalidateContractInstancesAsync private on exchange and tokenLeonid Logvinov2017-07-053-10/+10
|
* Add parameter validation for subscribeAsyncLeonid Logvinov2017-07-052-0/+10
|
* Add assert.doesBelongToStringEnumLeonid Logvinov2017-07-051-0/+11
|
* Add StringEnum typeLeonid Logvinov2017-07-051-1/+4
|
* Use orderHashSchema to validate order hashLeonid Logvinov2017-07-054-14/+9
|
* Refactor event testsLeonid Logvinov2017-07-051-4/+0
|
* Add tests for order hash SchemaLeonid Logvinov2017-07-051-0/+6
|
* Add orderHashSchemaLeonid Logvinov2017-07-042-1/+8
|
* Register new schemas within schema validatorLeonid Logvinov2017-07-041-0/+5
|
* Add index_filter_values_schema.ts and subscription_opts_schema.tsLeonid Logvinov2017-07-042-0/+32
|
* Make IndexedFilterValues type scricterLeonid Logvinov2017-07-041-1/+1
|
* Fix commentsLeonid Logvinov2017-07-042-7/+6
|
* Merge branch 'master' into subscribe-tokenLeonid2017-07-044-9/+26
|\
| * Merge pull request #89 from 0xProject/proxyLeonid2017-07-044-9/+26
| |\ | | | | | | 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-042-0/+13
| | |
| | * Make proxy wrapper public on zeroEx instanceLeonid Logvinov2017-07-041-4/+8
| | |
* | | Add initial implementation and tests for zeroEx.token.subscribeAsyncLeonid Logvinov2017-07-046-36/+128
|/ /
* | Rename _wrapEventCallback to _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-041-2/+2
| |
* | Merge branch 'master' into wrap-log-bignumberLeonid2017-07-0415-104/+348
|\|
| * Merge branch 'master' into add-exchange-address-to-order-structLeonid2017-07-042-2/+6
| |\
| | * Fix test failures caused by testrpc new eth_sign behaviourLeonid Logvinov2017-07-012-2/+6
| | |
| * | Stop passing exchangeContractAddress to utils.getOrderHashHexLeonid Logvinov2017-07-043-10/+5
| | |
| * | Await ZRX callLeonid Logvinov2017-07-041-1/+1
| | |
| * | Fix the commentLeonid Logvinov2017-07-041-1/+1
| | |
| * | Rename invalidateContractInstanceAsync to invalidateContractInstancesAsyncLeonid Logvinov2017-07-042-2/+2
| | |
| * | 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-302-2/+2
| | |
| * | Rename _proxy to _proxyWrapperLeonid Logvinov2017-06-301-4/+4
| | |
| * | Implement getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+16
| | |
| * | Store ProxyWrapper instance in ExchangeWrapperLeonid Logvinov2017-06-301-1/+4
| | |
| * | Add ProxyWrapper instance to zeroExLeonid Logvinov2017-06-301-1/+5
| | |
| * | Add Proxy wrapperLeonid Logvinov2017-06-301-0/+36
| | |
| * | Add type for a ProxyContractLeonid Logvinov2017-06-301-0/+6
| | |
| * | Rename Exchange.json to Exchange_v1.jsonLeonid Logvinov2017-06-302-1/+1
| | |
| * | Factor out ZRXtokenAddress variableLeonid Logvinov2017-06-301-1/+2
| | |
| * | Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ↵Leonid Logvinov2017-06-302-1/+2
| | | | | | | | | | | | 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
| | |
| * | Make getOrderHashHex a non-async functionLeonid Logvinov2017-06-301-1/+1
| | |
| * | Update contract artefactsLeonid Logvinov2017-06-286-16/+125
| | |
| * | Remove custom Schema type and use one from jsonschemaLeonid Logvinov2017-06-283-5/+2
| | |
| * | Remove _getExchangeAddressAsyncLeonid Logvinov2017-06-272-11/+1
| | |
| * | Allow multiple exchange versions t be functional at the same timeLeonid Logvinov2017-06-274-52/+127
| | |
| * | Move exchange artifacts to an exchange subfolderLeonid Logvinov2017-06-272-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-022-1/+20
|/
* 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
| | | | |