Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Decode logs args in awaitTransactionMinedAsync | Leonid Logvinov | 2017-09-06 | 5 | -12/+11 |
| | |||||
* | Cast to Artifat type | Leonid Logvinov | 2017-09-05 | 1 | -1/+1 |
| | |||||
* | Remove unused code | Leonid Logvinov | 2017-09-05 | 1 | -16/+0 |
| | |||||
* | Rename x.call -> x.callAsync x() -> x.sendTransactionAsync() x.estimateGas() ↵ | Leonid Logvinov | 2017-09-05 | 5 | -38/+41 |
| | | | | -> x.estimateGasAsync() | ||||
* | Fix gasPrice regression | Leonid Logvinov | 2017-09-05 | 5 | -11/+9 |
| | |||||
* | Change non-exhange contracts to also return txHash | Leonid Logvinov | 2017-09-05 | 3 | -19/+37 |
| | |||||
* | Make the functions immidiately return txHash instead of awaiting for a ↵ | Leonid Logvinov | 2017-09-05 | 6 | -85/+54 |
| | | | | transaction to be mined | ||||
* | Remove default value for gasPrice | Leonid Logvinov | 2017-08-29 | 5 | -6/+6 |
| | |||||
* | Allow user to specify the gas price | Leonid Logvinov | 2017-08-29 | 5 | -9/+14 |
| | |||||
* | Use 0x-json-schemas | Leonid Logvinov | 2017-08-28 | 2 | -29/+21 |
| | |||||
* | Improve comments | Leonid Logvinov | 2017-08-25 | 1 | -0/+4 |
| | |||||
* | Refactor UNLIMITED_ALLOWANCE_IN_BASE_UNITS to constants | Leonid Logvinov | 2017-08-25 | 1 | -1/+1 |
| | |||||
* | Add tests for unlimited allowance | Leonid Logvinov | 2017-08-25 | 1 | -1/+1 |
| | |||||
* | Add setUnlimitedProxyAllowanceAsync and setUnlimitedAllowanceAsync | Leonid Logvinov | 2017-08-25 | 1 | -0/+25 |
| | |||||
* | Convert artifacts addresses lo lower case before using | Leonid Logvinov | 2017-08-24 | 2 | -2/+2 |
| | |||||
* | Rename _getTokenByMetadata to _createTokenFromMetadata | Leonid Logvinov | 2017-08-24 | 1 | -4/+4 |
| | |||||
* | Remove redundant else's | Leonid Logvinov | 2017-08-24 | 1 | -4/+2 |
| | |||||
* | Add tests for tokenRegistry public getters | Leonid Logvinov | 2017-08-24 | 1 | -1/+1 |
| | |||||
* | Add all public tokenRegistry functions | Leonid Logvinov | 2017-08-24 | 1 | -0/+38 |
| | |||||
* | Add zeroEx.tokenRegistry.getTokenAddressesAsync() | Leonid Logvinov | 2017-08-24 | 1 | -1/+10 |
| | |||||
* | Fix comments | Leonid Logvinov | 2017-08-24 | 1 | -5/+7 |
| | |||||
* | Add a comment for isRoundingErrorAsync | Leonid Logvinov | 2017-08-24 | 1 | -5/+12 |
| | |||||
* | Remove And's from names | Leonid Logvinov | 2017-08-24 | 1 | -17/+17 |
| | |||||
* | Move order validation functions to orderValidationUtils and make ↵ | Leonid Logvinov | 2017-08-24 | 1 | -51/+26 |
| | | | | isRoundingError public | ||||
* | Add initial implementation for public order validation functions | Leonid Logvinov | 2017-08-24 | 1 | -48/+77 |
| | |||||
* | Merge pull request #131 from 0xProject/addTokenRegistryMethod | Fabio Berger | 2017-08-24 | 1 | -12/+26 |
|\ | | | | | Add public method to TokenRegistry | ||||
| * | rename method for clarity since we return a Token and not tokenMetadata | Fabio Berger | 2017-08-24 | 1 | -2/+2 |
| | | |||||
| * | Add assertion to public method | Fabio Berger | 2017-08-24 | 1 | -0/+3 |
| | | |||||
| * | Add public method `getTokenMetadataIfExistsAsync` to TokenRegistry wrapper, ↵ | Fabio Berger | 2017-08-23 | 1 | -12/+23 |
| | | | | | | | | refactor `getTokensAsync` to use `getTokenMetadataIfExistsAsync` under the hood and added unit tests | ||||
* | | Return variable instead of expression | Fabio Berger | 2017-08-23 | 2 | -2/+4 |
| | | |||||
* | | Add getContractAddressAsync public method to proxy instance | Fabio Berger | 2017-08-23 | 1 | -0/+9 |
|/ | |||||
* | Fix the docs for shouldThrowOnInsufficientBalanceOrAllowance | Leonid Logvinov | 2017-08-22 | 1 | -4/+6 |
| | |||||
* | Rename internally Proxy to TokenTransferProxy | Leonid Logvinov | 2017-08-22 | 2 | -41/+41 |
| | |||||
* | Update artifacts and rename proxy to tokenTransferProxy | Fabio Berger | 2017-08-21 | 2 | -4/+4 |
| | |||||
* | Merge pull request #118 from 0xProject/artifacts-update | Fabio Berger | 2017-08-21 | 2 | -4/+3 |
|\ | | | | | Update artifacts with the latest mainnet version | ||||
| * | Remove url from token registry | Leonid Logvinov | 2017-08-15 | 1 | -2/+1 |
| | | |||||
| * | Update Exchange artifacts and adjust ExchangeWrapper | Leonid Logvinov | 2017-08-15 | 1 | -2/+2 |
| | | |||||
* | | remove unnecessary assertion and add regression test | Fabio Berger | 2017-08-17 | 1 | -1/+0 |
| | | |||||
* | | remove unneeded assertion from _isRoundingErrorAsync since one can make ↵ | Fabio Berger | 2017-08-17 | 1 | -1/+0 |
| | | | | | | | | static calls without an available address | ||||
* | | Remove isUserAddressAvailable assertion from getBalanceAsync and add ↵ | Fabio Berger | 2017-08-17 | 1 | -1/+0 |
|/ | | | | regression test | ||||
* | Store tokenWrapper inside of OrdervalidationUtils | Leonid Logvinov | 2017-07-26 | 1 | -2/+4 |
| | |||||
* | Remove and from names | Leonid Logvinov | 2017-07-26 | 1 | -1/+1 |
| | |||||
* | Remove unused imports | Leonid Logvinov | 2017-07-26 | 3 | -8/+0 |
| | |||||
* | Refactor OrderValidationUtils to check for the case when ZRX is one of the ↵ | Leonid Logvinov | 2017-07-26 | 1 | -2/+2 |
| | | | | tokens traded | ||||
* | Pass tokenWrapper to ↵ | Leonid Logvinov | 2017-07-26 | 1 | -1/+1 |
| | | | | validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync | ||||
* | Move _validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync to ↵ | Leonid Logvinov | 2017-07-26 | 1 | -63/+4 |
| | | | | orderValidationUtils | ||||
* | Add forgotten meger conflict resolution | Leonid Logvinov | 2017-07-12 | 1 | -19/+0 |
| | |||||
* | Use PascalCase names as string enum keys | Leonid Logvinov | 2017-07-12 | 4 | -35/+63 |
| | |||||
* | Fix the comment | Leonid Logvinov | 2017-07-12 | 1 | -1/+3 |
| | |||||
* | Migrate to using a single Exchange contract | Leonid Logvinov | 2017-07-12 | 2 | -71/+40 |
| | |||||
* | Fix a typo | Leonid Logvinov | 2017-07-11 | 1 | -4/+4 |
| | |||||
* | Fix a typo in comment | Leonid Logvinov | 2017-07-11 | 1 | -2/+2 |
| | |||||
* | Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowance | Leonid Logvinov | 2017-07-11 | 1 | -10/+11 |
| | |||||
* | Change arguments order at isRoundingError | Leonid Logvinov | 2017-07-11 | 1 | -3/+3 |
| | |||||
* | Migrate events | Leonid Logvinov | 2017-07-11 | 1 | -3/+4 |
| | |||||
* | Migrate fillOrKillOrder | Leonid Logvinov | 2017-07-11 | 1 | -9/+9 |
| | |||||
* | Migrate ZRX_TOKEN_AMOUNT | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Migrate getUnavailableTakerTokenAmount | Leonid Logvinov | 2017-07-11 | 1 | -3/+3 |
| | |||||
* | Migrate batchFillOrKillOrders | Leonid Logvinov | 2017-07-11 | 1 | -5/+5 |
| | |||||
* | Migrate batchFillOrders | Leonid Logvinov | 2017-07-11 | 1 | -16/+20 |
| | |||||
* | Migrate fillOrder | Leonid Logvinov | 2017-07-11 | 1 | -20/+23 |
| | |||||
* | Migrate fillOrdersUpTo and remove min | Leonid Logvinov | 2017-07-11 | 1 | -13/+14 |
| | |||||
* | Migrate batchCancelOrders | Leonid Logvinov | 2017-07-11 | 1 | -5/+5 |
| | |||||
* | Migrate cencelOrder | Leonid Logvinov | 2017-07-11 | 1 | -9/+9 |
| | |||||
* | Revert "Migrate isRoundingError parameter changes" | Leonid Logvinov | 2017-07-11 | 1 | -5/+5 |
| | | | | This reverts commit 9a200c67210599faf5eb735893abae99f72a4d1f. | ||||
* | Revert "Rename ZRX to ZRX_TOKEN_CONTRACT" | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | | | | This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf. | ||||
* | Migrate isRoundingError parameter changes | Leonid Logvinov | 2017-07-11 | 1 | -5/+5 |
| | |||||
* | Rename ZRX to ZRX_TOKEN_CONTRACT | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Rename batchCancelOrderAsync to batchCancelOrdersAsync | Leonid Logvinov | 2017-07-08 | 1 | -1/+1 |
| | |||||
* | Rename batchFillOrderAsync to batchFillOrdersAsync | Leonid Logvinov | 2017-07-08 | 1 | -2/+2 |
| | |||||
* | Move zeroEx.exchange.getAvailableContractAddressesAsync to ↵ | Leonid Logvinov | 2017-07-06 | 1 | -45/+2 |
| | | | | zeroEx.getAvailableExchangeContractAddressesAsync and zeroEx.exchange.getProxyAuthorizedContractAddressesAsync to zeroEx.getProxyAuthorizedExchangeContractAddressesAsync | ||||
* | move order hash schema to a separate file | Leonid Logvinov | 2017-07-05 | 1 | -1/+2 |
| | |||||
* | Fix the bug when didn't invalidate etherToken contract instance | Leonid Logvinov | 2017-07-05 | 1 | -0/+3 |
| | |||||
* | Make this.proxy.invalidateContractInstance and ↵ | Leonid Logvinov | 2017-07-05 | 2 | -6/+6 |
| | | | | this.tokenRegistry.invalidateContractInstance private | ||||
* | Make invalidateContractInstancesAsync private on exchange and token | Leonid Logvinov | 2017-07-05 | 2 | -8/+8 |
| | |||||
* | Add parameter validation for subscribeAsync | Leonid Logvinov | 2017-07-05 | 2 | -0/+10 |
| | |||||
* | Use orderHashSchema to validate order hash | Leonid Logvinov | 2017-07-05 | 1 | -4/+4 |
| | |||||
* | Refactor event tests | Leonid Logvinov | 2017-07-05 | 1 | -4/+0 |
| | |||||
* | Add tests for order hash Schema | Leonid Logvinov | 2017-07-05 | 1 | -0/+6 |
| | |||||
* | Fix comments | Leonid Logvinov | 2017-07-04 | 1 | -5/+4 |
| | |||||
* | Merge branch 'master' into subscribe-token | Leonid | 2017-07-04 | 2 | -5/+15 |
|\ | |||||
| * | Merge pull request #89 from 0xProject/proxy | Leonid | 2017-07-04 | 2 | -5/+15 |
| |\ | | | | | | | Add zeroEx.proxy | ||||
| | * | Use call instead of use in the comments | Leonid Logvinov | 2017-07-04 | 2 | -6/+6 |
| | | | |||||
| | * | Fix the comment | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | | |||||
| | * | Add zeroEx.proxy.getAuthorizedAddressesAsync and tests | Leonid Logvinov | 2017-07-04 | 1 | -0/+10 |
| | | | |||||
* | | | Add initial implementation and tests for zeroEx.token.subscribeAsync | Leonid Logvinov | 2017-07-04 | 2 | -34/+57 |
|/ / | |||||
* | | Rename _wrapEventCallback to _getBigNumberWrappingEventCallback | Leonid Logvinov | 2017-07-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into wrap-log-bignumber | Leonid | 2017-07-04 | 2 | -61/+178 |
|\| | |||||
| * | Stop passing exchangeContractAddress to utils.getOrderHashHex | Leonid Logvinov | 2017-07-04 | 1 | -7/+2 |
| | | |||||
| * | Await ZRX call | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | |||||
| * | Fix the comment | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | |||||
| * | Rename invalidateContractInstanceAsync to invalidateContractInstancesAsync | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | |||||
| * | Fix _getProxyContractAsync function name | Leonid Logvinov | 2017-07-04 | 1 | -2/+2 |
| | | |||||
| * | Fix comment | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | |||||
| * | Fix comment | Leonid Logvinov | 2017-07-01 | 1 | -1/+1 |
| | | |||||
| * | Remove constructor | Leonid Logvinov | 2017-07-01 | 1 | -3/+0 |
| | | |||||
| * | Fix proxy comment | Leonid Logvinov | 2017-07-01 | 1 | -1/+1 |
| | | |||||
| * | Fix naming | Leonid Logvinov | 2017-07-01 | 1 | -2/+3 |
| | | |||||
| * | Fix a typo in authorized | Leonid Logvinov | 2017-07-01 | 1 | -3/+3 |
| | | |||||
| * | Fix a bug in getProxyAuthorizedContractAddressesAsync | Leonid Logvinov | 2017-07-01 | 1 | -2/+7 |
| | | |||||
| * | Move schema assertion up to prevent the _.map failure | Leonid Logvinov | 2017-07-01 | 1 | -1/+1 |
| | | |||||
| * | Fix a typo in authorized | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Implement getProxyAuthorizedContractAddressesAsync | Leonid Logvinov | 2017-06-30 | 1 | -0/+16 |
| | | |||||
| * | Store ProxyWrapper instance in ExchangeWrapper | Leonid Logvinov | 2017-06-30 | 1 | -1/+4 |
| | | |||||
| * | Add Proxy wrapper | Leonid Logvinov | 2017-06-30 | 1 | -0/+36 |
| | | |||||
| * | Factor out ZRXtokenAddress variable | Leonid Logvinov | 2017-06-30 | 1 | -1/+2 |
| | | |||||
| * | Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ↵ | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | | | | | | | ZeroExError.EXCHANGE_CONTRACT_DOES_NOT_EXIST | ||||
| * | Fix a typo in a name | Leonid Logvinov | 2017-06-30 | 1 | -2/+2 |
| | | |||||
| * | Factor out exchangeArtifacts variable | Leonid Logvinov | 2017-06-30 | 1 | -1/+2 |
| | | |||||
| * | Check that artefacts by networkId are not undefined before getting the address | Leonid Logvinov | 2017-06-30 | 1 | -2/+5 |
| | | |||||
| * | Fix a typo in a name | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Fix a typo in a name | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Move schema assertion up to prevent the _.map failure | Leonid Logvinov | 2017-06-30 | 1 | -2/+2 |
| | | |||||
| * | Move schema assertion up to prevent the _.map failure | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Mve schema assertion up to prevent the _.map failure | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Allow multiple exchange versions t be functional at the same time | Leonid Logvinov | 2017-06-27 | 1 | -48/+107 |
| | | |||||
| * | Move exchange artifacts to an exchange subfolder | Leonid Logvinov | 2017-06-27 | 1 | -1/+1 |
| | | |||||
* | | Check for a BigNumber instance | Leonid Logvinov | 2017-07-04 | 1 | -1/+8 |
| | | |||||
* | | Use _.isString instead of instanceof | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | | |||||
* | | Wrap all event args in a newer version of BigNumber and test it | Leonid Logvinov | 2017-07-02 | 1 | -1/+19 |
|/ | |||||
* | Additional EtherToken comment changes | Fabio Berger | 2017-06-27 | 1 | -10/+10 |
| | |||||
* | Improve EtherToken comments | Fabio Berger | 2017-06-27 | 1 | -10/+10 |
| | |||||
* | refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ↵ | Fabio Berger | 2017-06-27 | 1 | -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 typo | Fabio Berger | 2017-06-27 | 1 | -1/+1 |
| | |||||
* | Implement EtherTokenWrapper and tests, with deposit and withdraw methods | Fabio Berger | 2017-06-26 | 1 | -0/+76 |
| | |||||
* | Add missing return comment | Fabio Berger | 2017-06-26 | 1 | -0/+1 |
| | |||||
* | Fix incorrect merge consequences | Leonid Logvinov | 2017-06-23 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into fill-order-amuont | Leonid | 2017-06-23 | 4 | -44/+37 |
|\ | |||||
| * | Revert "Use different lodash import syntax which allows to include only used ↵ | Leonid | 2017-06-22 | 4 | -43/+37 |
| | | | | | | | | functions" | ||||
* | | Return filledTakerTokenAmount from fillOrdersUpToAsync | Leonid Logvinov | 2017-06-22 | 1 | -3/+10 |
| | | |||||
* | | Return cancelledAmount from cancelOrderAsync | Leonid Logvinov | 2017-06-22 | 1 | -1/+6 |
| | | |||||
* | | Fix return comment | Leonid Logvinov | 2017-06-22 | 1 | -1/+1 |
| | | |||||
* | | Return filledAmount from fillOrderAsync | Leonid Logvinov | 2017-06-21 | 1 | -1/+6 |
|/ | |||||
* | Fall back to import x = require() syntax | Leonid Logvinov | 2017-06-21 | 4 | -10/+10 |
| | |||||
* | Use different lodash import syntax which allows to include only used functions | Leonid Logvinov | 2017-06-21 | 4 | -37/+43 |
| | |||||
* | Add missing semi-colon | Fabio Berger | 2017-06-20 | 1 | -1/+1 |
| | |||||
* | Improve comment | Fabio Berger | 2017-06-20 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:0xProject/0x.js | Fabio Berger | 2017-06-19 | 1 | -1/+2 |
|\ | |||||
| * | Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgs | Leonid Logvinov | 2017-06-19 | 1 | -2/+2 |
| | | |||||
| * | Add actual type for contract event arguments | Leonid Logvinov | 2017-06-15 | 1 | -1/+2 |
| | | |||||
* | | Add and improve comments | Fabio Berger | 2017-06-16 | 3 | -12/+25 |
|/ | |||||
* | Remove types that are not used in public interface from export and rename ↵ | Leonid Logvinov | 2017-06-14 | 1 | -7/+7 |
| | | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues | ||||
* | Rename ZeroExEvent to EventEmitter | Leonid Logvinov | 2017-06-13 | 1 | -12/+12 |
| | |||||
* | Bind watch function on an event | Leonid Logvinov | 2017-06-13 | 1 | -1/+1 |
| | |||||
* | Refactor subscription to return zeroExSignature object | Leonid Logvinov | 2017-06-13 | 1 | -16/+27 |
| | |||||
* | Add getContractAddressAsync and tests | Leonid Logvinov | 2017-06-13 | 1 | -0/+9 |
| | |||||
* | Duplicate truffle contracts types | Leonid Logvinov | 2017-06-11 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into private | Leonid | 2017-06-11 | 1 | -14/+22 |
|\ | |||||
| * | Merge pull request #60 from 0xProject/error-decorator | Fabio Berger | 2017-06-11 | 1 | -0/+8 |
| |\ | | | | | | | Add initial error handling decorator implementation | ||||
| | * | Merge branch 'master' into error-decorator | Leonid | 2017-06-10 | 3 | -12/+93 |
| | |\ | |||||
| | * | | Add initial error handling decorator implementation | Leonid Logvinov | 2017-06-10 | 1 | -0/+8 |
| | | | | |||||
| * | | | Remove Hex suffix from public functions parameters names | Leonid Logvinov | 2017-06-10 | 1 | -14/+14 |
| | |/ | |/| | |||||
* | | | Fix last tests | Leonid Logvinov | 2017-06-11 | 3 | -20/+20 |
| | | | |||||
* | | | Prefix private vars with _ | Leonid Logvinov | 2017-06-10 | 4 | -116/+117 |
|/ / | |||||
* | | Align all param comments so that they are more readable | Fabio Berger | 2017-06-10 | 3 | -64/+76 |
| | | |||||
* | | Add param & return comments to all public methods and add comments to some ↵ | Fabio Berger | 2017-06-10 | 3 | -12/+81 |
|/ | | | | public methods that were missing them | ||||
* | Address feedback | Leonid Logvinov | 2017-06-10 | 1 | -1/+1 |
| | |||||
* | Fix test | Leonid Logvinov | 2017-06-10 | 1 | -8/+5 |
| | |||||
* | Merge branch 'master' into json-schema | Leonid | 2017-06-10 | 1 | -5/+4 |
|\ | |||||
| * | Merge branch 'master' into async-bug | Leonid | 2017-06-09 | 1 | -20/+83 |
| |\ | |||||
| * | | Use for of | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | | | |||||
| * | | Fix the bug of not awaiting an async function | Leonid Logvinov | 2017-06-09 | 1 | -4/+3 |
| | | | |||||
* | | | Merge branch 'master' into json-schema | Leonid | 2017-06-09 | 1 | -4/+71 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -16/+12 |
| |\ \ | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-09 | 1 | -5/+2 |
| | | | | |||||
| * | | | Add signedOrdersScxhema | Leonid Logvinov | 2017-06-09 | 1 | -0/+4 |
| | | | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add assert.hashAtMostOneUniqueValue | Leonid Logvinov | 2017-06-09 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -24/+89 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Add tests for fillOrdersUpTo | Leonid Logvinov | 2017-06-09 | 1 | -7/+7 |
| | | | | |||||
| * | | | Implement fillOrderUpToAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+66 |
| | | | | |||||
* | | | | Fix tests one more | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into json-schema | Leonid | 2017-06-09 | 1 | -12/+7 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add orderCancelrequestsSchema and orderFillRequestsSchema | Leonid Logvinov | 2017-06-09 | 1 | -16/+12 |
| | |/ | |/| | |||||
* | | | Make static function public | Leonid Logvinov | 2017-06-09 | 1 | -1/+0 |
| | | | |||||
* | | | Convert to JSON schema compatible object by default | Leonid Logvinov | 2017-06-09 | 1 | -19/+7 |
|/ / | |||||
* | | fix indentation | Fabio Berger | 2017-06-09 | 1 | -13/+13 |
| | | |||||
* | | add comment explaining the use of any | Fabio Berger | 2017-06-09 | 1 | -0/+1 |
| | | |||||
* | | Improve comment | Fabio Berger | 2017-06-09 | 1 | -1/+1 |
| | | |||||
* | | Add orderFillOrKillRequestsSchema and validate using it instead of looping ↵ | Fabio Berger | 2017-06-09 | 1 | -4/+5 |
| | | | | | | | | over the requests and validating them individually | ||||
* | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 2 | -26/+92 |
|\| | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| * | Merge pull request #48 from 0xProject/interfaceTweaks | Leonid | 2017-06-08 | 1 | -1/+1 |
| |\ | | | | | | | Interface tweaks | ||||
| | * | Merge branch 'master' into interfaceTweaks | Leonid | 2017-06-08 | 1 | -0/+6 |
| | |\ | |||||
| | * | | Make web3Wrapper protected instead of public | Fabio Berger | 2017-06-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #47 from 0xProject/is-valid-signature-contract | Leonid | 2017-06-08 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Refactor isValidSignature | ||||
| | * \ \ | Merge branch 'master' into is-valid-signature-contract | Leonid | 2017-06-08 | 1 | -0/+6 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Refactor isValidSignature | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 1 | -0/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -9/+12 |
| | | | | |||||
| * | | | Use isSenderAddressAsync | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Address old feedback | Leonid Logvinov | 2017-06-08 | 1 | -2/+3 |
| | | | | |||||
| * | | | Fix spacing | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 1 | -25/+106 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Don't use batchFillOrderAsync for fillOrderAsync | Leonid Logvinov | 2017-06-08 | 1 | -3/+37 |
| | | | | |||||
| * | | | Add no-op test | Leonid Logvinov | 2017-06-08 | 1 | -1/+3 |
| | | | | |||||
| * | | | Remove old comment | Leonid Logvinov | 2017-06-08 | 1 | -1/+0 |
| | | | | |||||
| * | | | Refactor to use OrderFillRequest | Leonid Logvinov | 2017-06-07 | 1 | -22/+26 |
| | | | | |||||
| * | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -27/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -17/+19 |
| |\ \ \ \ | |||||
| * | | | | | Add assertion for empty batch | Leonid Logvinov | 2017-06-07 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix linter errors | Leonid Logvinov | 2017-06-07 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+45 |
| | | | | | | |||||
| * | | | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -21/+43 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -0/+6 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Add getOrderHashHexUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -2/+56 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts | ||||
| * | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -6/+9 |
| | | | | | |||||
| * | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | Don't use batch function for normal one | Leonid Logvinov | 2017-06-08 | 1 | -3/+27 |
| | | | | | |||||
| * | | | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 1 | -7/+57 |
| |\ \ \ \ | |||||
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -8/+11 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Use batchCancel for normal cancel | Leonid Logvinov | 2017-06-07 | 1 | -28/+5 |
| | |_|/ | |/| | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -17/+19 |
| | | | | |||||
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+45 |
| | | | | |||||
* | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 1 | -7/+70 |
| |/ / |/| | | |||||
* | | | Remove catch of invalid jump throws since there are many reasons the ↵ | Fabio Berger | 2017-06-07 | 1 | -24/+14 |
| | | | | | | | | | | | | contracts could throw this error | ||||
* | | | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 1 | -4/+4 |
| | | | |||||
* | | | remove unused arg | Fabio Berger | 2017-06-07 | 1 | -2/+1 |
| | | | |||||
* | | | merge master | Fabio Berger | 2017-06-07 | 1 | -31/+79 |
|\| | | |||||
| * | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 1 | -4/+1 |
| |/ | |||||
| * | Use union type Order|SignedOrder | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
| | | |||||
| * | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -16/+15 |
| | | |||||
| * | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 1 | -31/+35 |
| | | |||||
| * | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -1/+7 |
| | | |||||
| * | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 1 | -1/+52 |
| | | |||||
* | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -17/+88 |
|/ | |||||
* | Address feedback | Leonid Logvinov | 2017-06-06 | 2 | -3/+3 |
| | |||||
* | Add isAnyAddressAvailableAsync | Leonid Logvinov | 2017-06-06 | 2 | -0/+3 |
| | |||||
* | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 |
| | |||||
* | Rename senderAccount to senderAddress | Leonid Logvinov | 2017-06-06 | 2 | -13/+13 |
| | |||||
* | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 |
| | |||||
* | Rename senderAccount to takerAddress | Leonid Logvinov | 2017-06-06 | 1 | -5/+5 |
| | |||||
* | Add variableName to isSenderAddcountHexAsync | Leonid Logvinov | 2017-06-06 | 2 | -4/+4 |
| | |||||
* | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 2 | -27/+19 |
| | |||||
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -1/+46 |
|\ | | | | | Implement zeroEx.exchange.subscribeAsync | ||||
| * | Run stopWatching in parallel | Fabio Berger | 2017-06-03 | 1 | -3/+4 |
| | | |||||
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -31/+98 |
| |\ | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * \ | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -4/+14 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| * | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 1 | -1/+45 |
| | | | | | | | | | | | | | | | | if user updates the provider | ||||
| * | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
* | \ \ \ | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 2 | -2/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | ||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 1 | -31/+98 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+16 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | Always wrap BigNumbers returned by web3 with our own version and add comment | Fabio Berger | 2017-06-02 | 2 | -5/+11 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+4 |
| |\ \ \ \ |