Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Rename Log*Args to Log*ContractEventArgs | Leonid Logvinov | 2017-06-21 | 2 | -5/+5 |
| | |||||
* | Fall back to import x = require() syntax | Leonid Logvinov | 2017-06-21 | 10 | -23/+23 |
| | |||||
* | Use different lodash import syntax which allows to include only used functions | Leonid Logvinov | 2017-06-21 | 10 | -60/+73 |
| | |||||
* | Add missing semi-colon | Fabio Berger | 2017-06-20 | 1 | -1/+1 |
| | |||||
* | Add newline between type defs | Fabio Berger | 2017-06-20 | 1 | -0/+1 |
| | |||||
* | Improve comment | Fabio Berger | 2017-06-20 | 1 | -3/+3 |
| | |||||
* | Fix tslint issue | Fabio Berger | 2017-06-19 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of github.com:0xProject/0x.js | Fabio Berger | 2017-06-19 | 5 | -14/+53 |
|\ | |||||
| * | Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgs | Leonid Logvinov | 2017-06-19 | 3 | -7/+7 |
| | | |||||
| * | Merge branch 'master' into event-types | Leonid | 2017-06-15 | 4 | -11/+17 |
| |\ | |||||
| | * | Switch back to using Web3.Provider, not Web3Provider in internal classes | Leonid Logvinov | 2017-06-15 | 1 | -4/+3 |
| | | | |||||
| | * | Add explaining comment for the web3Provider type | Leonid Logvinov | 2017-06-15 | 1 | -1/+5 |
| | | | |||||
| | * | Make ZeroEx constructor accept Web3Provider instead of Web3 instance | Leonid Logvinov | 2017-06-15 | 4 | -13/+16 |
| | | | |||||
| * | | Add actual type for contract event arguments | Leonid Logvinov | 2017-06-15 | 3 | -2/+36 |
| |/ | |||||
| * | Remove unused import | Leonid Logvinov | 2017-06-15 | 1 | -1/+0 |
| | | |||||
* | | Add and improve comments | Fabio Berger | 2017-06-16 | 4 | -17/+43 |
|/ | |||||
* | Remove types that are not used in public interface from export and rename ↵ | Leonid Logvinov | 2017-06-14 | 3 | -16/+12 |
| | | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues | ||||
* | Rename ZeroExEvent to EventEmitter | Leonid Logvinov | 2017-06-13 | 3 | -14/+14 |
| | |||||
* | 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 | 4 | -18/+35 |
| | |||||
* | Add getContractAddressAsync and tests | Leonid Logvinov | 2017-06-13 | 1 | -0/+9 |
| | |||||
* | Export DoneCallback | Leonid Logvinov | 2017-06-13 | 1 | -0/+1 |
| | |||||
* | Introduce index.ts file which defines public interface | Leonid Logvinov | 2017-06-13 | 1 | -0/+24 |
| | |||||
* | Change main file name from 0x.js.ts to 0x.ts | Leonid Logvinov | 2017-06-12 | 1 | -0/+0 |
| | |||||
* | Duplicate truffle contracts types | Leonid Logvinov | 2017-06-11 | 2 | -1/+9 |
| | |||||
* | Add type references | Leonid Logvinov | 2017-06-11 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into private | Leonid | 2017-06-11 | 5 | -36/+85 |
|\ | |||||
| * | Merge pull request #60 from 0xProject/error-decorator | Fabio Berger | 2017-06-11 | 4 | -0/+49 |
| |\ | | | | | | | Add initial error handling decorator implementation | ||||
| | * | Merge branch 'master' into error-decorator | Leonid | 2017-06-10 | 4 | -24/+139 |
| | |\ | |||||
| | * | | Add initial error handling decorator implementation | Leonid Logvinov | 2017-06-10 | 4 | -0/+49 |
| | | | | |||||
| * | | | Remove Hex suffix from public functions parameters names | Leonid Logvinov | 2017-06-10 | 2 | -36/+36 |
| | |/ | |/| | |||||
* | | | Fix last tests | Leonid Logvinov | 2017-06-11 | 3 | -20/+20 |
| | | | |||||
* | | | Prefix private vars with _ | Leonid Logvinov | 2017-06-10 | 5 | -129/+130 |
|/ / | |||||
* | | Align all param comments so that they are more readable | Fabio Berger | 2017-06-10 | 4 | -87/+99 |
| | | |||||
* | | Add param & return comments to all public methods and add comments to some ↵ | Fabio Berger | 2017-06-10 | 4 | -24/+127 |
|/ | | | | public methods that were missing them | ||||
* | Merge branch 'master' into json-schema | Leonid | 2017-06-10 | 6 | -8/+18 |
|\ | |||||
| * | Merge branch 'master' into schema-tests | Leonid | 2017-06-10 | 2 | -4/+3 |
| |\ | |||||
| * | | Fix bugs in schemas | Leonid Logvinov | 2017-06-10 | 3 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into schema-tests | Leonid | 2017-06-10 | 1 | -5/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into schema-tests | Leonid | 2017-06-09 | 4 | -5/+87 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into schema-tests | Leonid | 2017-06-09 | 3 | -16/+36 |
| |\ \ \ \ | |||||
| * | | | | | Fix tests | Leonid Logvinov | 2017-06-09 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | Add tests for TokenSchema | Leonid Logvinov | 2017-06-09 | 2 | -4/+7 |
| | | | | | | |||||
| * | | | | | Add ecSignatureSchema tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into json-schema | Leonid | 2017-06-10 | 2 | -4/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Move MAX_DIGITS_IN_UNSIGNED_256_INT to constants | Fabio Berger | 2017-06-10 | 2 | -4/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix tests | Leonid Logvinov | 2017-06-10 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Address feedback | Leonid Logvinov | 2017-06-10 | 2 | -9/+6 |
| | | | | | |||||
* | | | | | 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 | 6 | -21/+123 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | 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 | 4 | -5/+87 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 3 | -16/+36 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-09 | 2 | -6/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -4/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Add signedOrdersScxhema | Leonid Logvinov | 2017-06-09 | 2 | -0/+9 |
| | | | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-09 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add assert.hashAtMostOneUniqueValue | Leonid Logvinov | 2017-06-09 | 3 | -7/+10 |
| | | | | |||||
| * | | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 6 | -38/+128 |
| |\ \ \ | |||||
| * | | | | Add tests for fillOrdersUpTo | Leonid Logvinov | 2017-06-09 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | Implement fillOrderUpToAsync | Leonid Logvinov | 2017-06-08 | 2 | -0/+73 |
| | | | | | |||||
* | | | | | 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 | 3 | -12/+31 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix the other schema bug | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into schemas | Leonid | 2017-06-09 | 1 | -4/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Fix schema error | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add orderCancelrequestsSchema and orderFillRequestsSchema | Leonid Logvinov | 2017-06-09 | 3 | -16/+36 |
| | |_|/ | |/| | | |||||
* | | | | Make static function public | Leonid Logvinov | 2017-06-09 | 2 | -2/+1 |
| | | | | |||||
* | | | | Convert to JSON schema compatible object by default | Leonid Logvinov | 2017-06-09 | 2 | -22/+11 |
| |/ / |/| | | |||||
* | | | Remove isSenderAddressAvailableAsync | Leonid Logvinov | 2017-06-09 | 1 | -4/+0 |
|/ / | |||||
* | | 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 | 5 | -18/+33 |
| | | | | | | | | over the requests and validating them individually | ||||
* | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 4 | -34/+111 |
|\| | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| * | Merge pull request #48 from 0xProject/interfaceTweaks | Leonid | 2017-06-08 | 2 | -9/+9 |
| |\ | | | | | | | 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 |
| | | | | |||||
| | * | | Fix comments | Fabio Berger | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| | * | | rename decimals to numDecimals for clarity | Fabio Berger | 2017-06-08 | 1 | -6/+6 |
| | | | | |||||
| * | | | 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 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Remove unused import | Leonid Logvinov | 2017-06-08 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Move isValidSignature back from utils | Leonid Logvinov | 2017-06-08 | 2 | -16/+13 |
| | | | | | |||||
| | * | | | Refactor isValidSignature | Leonid Logvinov | 2017-06-08 | 3 | -15/+19 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 1 | -0/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -9/+12 |
| | | | | |||||
| * | | | Fix names in types | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Use isSenderAddressAsync | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Address old feedback | Leonid Logvinov | 2017-06-08 | 2 | -8/+3 |
| | | | | |||||
| * | | | Fix spacing | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 3 | -30/+119 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | 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 | 2 | -27/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 2 | -17/+24 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 2 | -0/+51 |
| | | | | | | |||||
| * | | | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 |
| | | | | | | |||||
| * | | | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 |
| | | | | | | |||||
| * | | | | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 3 | -21/+55 |
| | | | | | | |||||
* | | | | | | 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 | 2 | -2/+68 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 3 | -12/+69 |
| |\ \ \ \ | |||||
| * | | | | | Fix linter error | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 2 | -8/+12 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Use batchCancel for normal cancel | Leonid Logvinov | 2017-06-07 | 1 | -28/+5 |
| | |_|/ | |/| | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 3 | -23/+24 |
| | | | | |||||
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 2 | -3/+3 |
| | | | | |||||
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 3 | -0/+57 |
| | | | | |||||
* | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 2 | -7/+81 |
| |/ / |/| | | |||||
* | | | make txOpts optional | Fabio Berger | 2017-06-07 | 1 | -2/+2 |
| | | | |||||
* | | | Remove catch of invalid jump throws since there are many reasons the ↵ | Fabio Berger | 2017-06-07 | 2 | -25/+14 |
| | | | | | | | | | | | | contracts could throw this error | ||||
* | | | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 2 | -6/+6 |
| | | | |||||
* | | | Spacing fix | Fabio Berger | 2017-06-07 | 1 | -2/+1 |
| | | | |||||
* | | | remove unused arg | Fabio Berger | 2017-06-07 | 1 | -2/+1 |
| | | | |||||
* | | | remove space | Fabio Berger | 2017-06-07 | 1 | -1/+0 |
| | | | |||||
* | | | merge master | Fabio Berger | 2017-06-07 | 4 | -44/+108 |
|\| | | |||||
| * | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 |
| | | | |||||
| * | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 |
| | | | |||||
| * | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 |
| |/ | |||||
| * | Use union type Order|SignedOrder | Leonid Logvinov | 2017-06-07 | 2 | -4/+4 |
| | | |||||
| * | Make txOpts optional | Leonid Logvinov | 2017-06-07 | 1 | -7/+7 |
| | | |||||
| * | Address feedback | Leonid Logvinov | 2017-06-07 | 4 | -45/+58 |
| | | |||||
| * | Add missing semicolon | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 2 | -31/+39 |
| | | |||||
| * | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 2 | -1/+9 |
| | | |||||
| * | Merge branch 'master' into cancelAsync | Leonid Logvinov | 2017-06-06 | 1 | -2/+3 |
| |\ | |||||
| * | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 2 | -1/+58 |
| | | | |||||
* | | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 6 | -45/+131 |
| |/ |/| | |||||
* | | avoid newline issues by putting the assertion message on a single line | Fabio Berger | 2017-06-06 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #39 from 0xProject/senderAccount | Leonid | 2017-06-06 | 6 | -66/+38 |
|\ | | | | | Make methods accept senderAccount | ||||
| * | Address feedback | Leonid Logvinov | 2017-06-06 | 3 | -5/+5 |
| | | |||||
| * | Add isAnyAddressAvailableAsync | Leonid Logvinov | 2017-06-06 | 4 | -6/+7 |
| | | |||||
| * | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 4 | -13/+13 |
| | | |||||
| * | Rename senderAddress to signerAddress | Leonid Logvinov | 2017-06-06 | 1 | -4/+4 |
| | | |||||
| * | Use variable name in assertin message | Leonid Logvinov | 2017-06-06 | 1 | -3/+4 |
| | | |||||
| * | Rename accounts to addreses | Leonid Logvinov | 2017-06-06 | 3 | -10/+10 |
| | | |||||
| * | Rename senderAccount to senderAddress | Leonid Logvinov | 2017-06-06 | 4 | -23/+23 |
| | | |||||
| * | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 4 | -6/+6 |
| | | |||||
| * | Rename senderAccount to takerAddress | Leonid Logvinov | 2017-06-06 | 1 | -5/+5 |
| | | |||||
| * | Remove redundant reassignment | Leonid Logvinov | 2017-06-06 | 1 | -3/+2 |
| | | |||||
| * | Fix comments | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Add variableName to isSenderAddcountHexAsync | Leonid Logvinov | 2017-06-06 | 3 | -7/+8 |
| | | |||||
| * | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 6 | -68/+38 |
| | | |||||
* | | Add tests to number regex and BigNumber serialization & fix bugs | Leonid Logvinov | 2017-06-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 10 | -568/+131 |
|\ | | | | | Implement zeroEx.exchange.subscribeAsync | ||||
| * | Consolidate the ExchangeContract type and flesh out type definition for ↵ | Fabio Berger | 2017-06-03 | 1 | -20/+19 |
| | | | | | | | | isValidSignature.call | ||||
| * | Run stopWatching in parallel | Fabio Berger | 2017-06-03 | 1 | -3/+4 |
| | | |||||
| * | Be more specific with blockParam valid values | Fabio Berger | 2017-06-03 | 1 | -2/+4 |
| | | |||||
| * | Update artifacts | Fabio Berger | 2017-06-03 | 6 | -566/+35 |
| | | |||||
| * | Revert unintentional artifact changes | Fabio Berger | 2017-06-03 | 6 | -35/+566 |
| | | |||||
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -52/+126 |
| |\ | | | | | | | | | | | | | | | | | | | # 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 | 4 | -3/+91 |
| | | | | | | | | | | | | | | | | if user updates the provider | ||||
| * | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 3 | -4/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | Update artifacts | Fabio Berger | 2017-06-02 | 6 | -561/+30 |
| | | | | | |||||
* | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 6 | -9/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | ||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 4 | -56/+126 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 3 | -7/+23 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | | | | improve comment | Fabio Berger | 2017-06-02 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Add comment about the isString assertion lest the next developer tries to ↵ | Fabio Berger | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | use a stricter assertion (i.e isHexString) which we intentionally did not do | ||||
| * | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵ | Fabio Berger | 2017-06-02 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | and getCanceledTakerAmountAsync | ||||
| * | | | | 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 | 3 | -4/+9 |
| |\ \ \ \ | |||||
| * | | | | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 3 | -5/+21 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 9 | -69/+329 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 2 | -1/+17 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵ | Fabio Berger | 2017-06-01 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync | ||||
| * | | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHash | Fabio Berger | 2017-06-01 | 3 | -4/+12 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix bug | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Add missing async suffix | Fabio Berger | 2017-06-03 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 9 | -77/+451 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | ||||
| * | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 2 | -59/+66 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 1 | -5/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -20/+20 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Allign arguments | Leonid Logvinov | 2017-06-03 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Rewrite comment | Leonid Logvinov | 2017-06-03 | 1 | -5/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 2 | -22/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Assign wouldRoundingErrorOccur to a variable | Leonid Logvinov | 2017-06-02 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Assign timestamp to a variable | Leonid Logvinov | 2017-06-02 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Don't pass zrxTokenAsign | Leonid Logvinov | 2017-06-02 | 1 | -6/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Rename validation functions | Leonid Logvinov | 2017-06-02 | 1 | -8/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add getZRXTokenAddressAsync | Leonid Logvinov | 2017-06-02 | 1 | -1/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 2 | -16/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve fillOrderAsync comment | Fabio Berger | 2017-06-02 | 1 | -3/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-02 | 1 | -321/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Remove protocol token artifacts | Leonid Logvinov | 2017-06-02 | 1 | -321/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 2 | -8/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Improve comment | Fabio Berger | 2017-06-02 | 1 | -2/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 2 | -9/+52 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add ProtocolTokenArtifacts | Leonid Logvinov | 2017-06-02 | 1 | -0/+321 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 2 | -0/+21 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -4/+14 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵ | Fabio Berger | 2017-06-02 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined if non available | ||||
| * | | | | | | | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 2 | -0/+9 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test | ||||
| * | | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 3 | -5/+11 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 3 | -4/+20 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Fix import | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵ | Fabio Berger | 2017-06-01 | 1 | -28/+41 |
| | | | | | | | | | | | | | | | | | | | | artifacts | ||||
| * | | | | rename txData to txOpts | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | remove superfluous param | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove unused arg | Fabio Berger | 2017-06-01 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | remove unneeded method | Fabio Berger | 2017-06-01 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | improve comment | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 2 | -0/+4 |
| |\ \ \ \ | |||||
| | * | | | | Add expired check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Add EXPIRED error type | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add comment for fillOrderAsync method, rename fillAmount to ↵ | Fabio Berger | 2017-06-01 | 1 | -6/+11 |
| |/ / / / | | | | | | | | | | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer | ||||
| * | | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 2 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c. | ||||
| * | | | | Get getSenderAddressOrThrowAsync everywhere where we throw if the ↵ | Fabio Berger | 2017-06-01 | 2 | -15/+12 |
| | | | | | | | | | | | | | | | | | | | | senderAddress doesn't exist | ||||
| * | | | | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 2 | -8/+17 |
| | | | | | |||||
| * | | | | fix formatting | Fabio Berger | 2017-06-01 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 2 | -1/+23 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| | * | | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 2 | -1/+5 |
| | | | | | | |||||
| | * | | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 2 | -0/+4 |
| | | | | | | |||||
| | * | | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 2 | -0/+14 |
| | | | | | | |||||
| * | | | | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 2 | -10/+10 |
| |/ / / / | |||||
| * | | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 4 | -7/+6 |
| | | | | | |||||
| * | | | | rename signed_order_schema to order_schemas | Fabio Berger | 2017-06-01 | 4 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -4/+0 |
| |\ \ \ \ | |||||
| | * | | | | Fix types hell with, chai and chai-as-promised | Leonid Logvinov | 2017-06-01 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Add convertToJSONSchemaCompatibleObject method | Fabio Berger | 2017-06-01 | 3 | -2/+15 |
| | | | | | | |||||
| * | | | | | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | make bigNumberConfig a module | Fabio Berger | 2017-06-01 | 2 | -9/+13 |
| | | | | |