Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into subscribe-token | Leonid | 2017-07-04 | 2 | -4/+13 |
|\ | |||||
| * | Merge pull request #89 from 0xProject/proxy | Leonid | 2017-07-04 | 2 | -4/+13 |
| |\ | | | | | | | Add zeroEx.proxy | ||||
| | * | Add zeroEx.proxy.getAuthorizedAddressesAsync and tests | Leonid Logvinov | 2017-07-04 | 1 | -0/+11 |
| | | | |||||
| | * | Make proxy wrapper public on zeroEx instance | Leonid Logvinov | 2017-07-04 | 2 | -4/+2 |
| | | | |||||
* | | | Add initial implementation and tests for zeroEx.token.subscribeAsync | Leonid Logvinov | 2017-07-04 | 1 | -1/+112 |
|/ / | |||||
* | | Fix merge problems | Leonid Logvinov | 2017-07-04 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into wrap-log-bignumber | Leonid | 2017-07-04 | 6 | -61/+145 |
|\| | |||||
| * | Merge branch 'master' into add-exchange-address-to-order-struct | Leonid | 2017-07-04 | 1 | -0/+3 |
| |\ | |||||
| | * | Assert correct event names in subscribeAsync tests | Leonid Logvinov | 2017-07-01 | 1 | -0/+3 |
| | | | |||||
| * | | Fix comment | Leonid Logvinov | 2017-07-01 | 1 | -1/+1 |
| | | | |||||
| * | | Add tests for getProxyAuthorizedContractAddressesAsync | Leonid Logvinov | 2017-06-30 | 1 | -0/+12 |
| | | | |||||
| * | | Remove unused code from test/proxy_wrapper_test.ts | Leonid Logvinov | 2017-06-30 | 1 | -12/+0 |
| | | | |||||
| * | | Add a test for a ProxyWrapper | Leonid Logvinov | 2017-06-30 | 1 | -0/+35 |
| | | | |||||
| * | | Make zeroEx.getOrderHashHex non-async | Leonid Logvinov | 2017-06-30 | 2 | -10/+10 |
| | | | |||||
| * | | Fix typo in getAvailableContractAddressesAsync | Leonid Logvinov | 2017-06-30 | 2 | -3/+3 |
| | | | |||||
| * | | Make it clear that we are using a fake address in tests | Leonid Logvinov | 2017-06-30 | 1 | -2/+2 |
| | | | |||||
| * | | Fix a typo in a name | Leonid Logvinov | 2017-06-30 | 1 | -2/+2 |
| | | | |||||
| * | | Make getOrderHashHex a non-async function | Leonid Logvinov | 2017-06-30 | 1 | -13/+2 |
| | | | |||||
| * | | Allow multiple exchange versions t be functional at the same time | Leonid Logvinov | 2017-06-27 | 5 | -38/+95 |
| |/ | |||||
* / | Wrap all event args in a newer version of BigNumber and test it | Leonid Logvinov | 2017-07-02 | 1 | -21/+24 |
|/ | |||||
* | Merge pull request #81 from 0xProject/addWrappedETHSupport | Leonid | 2017-06-27 | 1 | -0/+106 |
|\ | | | | | Add Wrapped ETH Support | ||||
| * | refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ↵ | Fabio Berger | 2017-06-27 | 1 | -18/+25 |
| | | | | | | | | 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/+99 |
| | | |||||
* | | Rename KOVAN_URL to KOVAN_RPC_URL | Leonid Logvinov | 2017-06-23 | 2 | -2/+2 |
| | | |||||
* | | Simplify integration tests | Leonid Logvinov | 2017-06-23 | 1 | -34/+4 |
| | | |||||
* | | Refactor KOVAN_URL to constants and fetch mnemonic from package.json | Leonid Logvinov | 2017-06-23 | 2 | -2/+7 |
| | | |||||
* | | Add kovan integration tests | Leonid Logvinov | 2017-06-23 | 1 | -0/+54 |
|/ | |||||
* | Merge branch 'master' into fill-order-amuont | Leonid | 2017-06-23 | 5 | -20/+16 |
|\ | |||||
| * | Revert "Use different lodash import syntax which allows to include only used ↵ | Leonid | 2017-06-22 | 5 | -20/+16 |
| | | | | | | | | functions" | ||||
* | | Add test for return amount from fillOrdersUpToAsync | Leonid Logvinov | 2017-06-22 | 1 | -0/+6 |
| | | |||||
* | | Add test for cancelOrderAsync return value | Leonid Logvinov | 2017-06-22 | 1 | -0/+4 |
| | | |||||
* | | Add simple test checking that fillOrderAsync return filled amount | Leonid Logvinov | 2017-06-22 | 1 | -0/+10 |
| | | |||||
* | | Return filledAmount from fillOrderAsync | Leonid Logvinov | 2017-06-21 | 1 | -0/+18 |
|/ | |||||
* | Fall back to import x = require() syntax | Leonid Logvinov | 2017-06-21 | 5 | -9/+9 |
| | |||||
* | Use different lodash import syntax which allows to include only used functions | Leonid Logvinov | 2017-06-21 | 5 | -16/+20 |
| | |||||
* | Fix bug in 0x.js tests when passing Web3 instead of Web3 Provider | Leonid Logvinov | 2017-06-15 | 1 | -1/+1 |
| | |||||
* | Make ZeroEx constructor accept Web3Provider instead of Web3 instance | Leonid Logvinov | 2017-06-15 | 5 | -7/+7 |
| | |||||
* | Remove types that are not used in public interface from export and rename ↵ | Leonid Logvinov | 2017-06-14 | 2 | -3/+2 |
| | | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues | ||||
* | Address feedback | Leonid Logvinov | 2017-06-14 | 1 | -2/+2 |
| | |||||
* | Add tests for stopWatchingAsync | Leonid Logvinov | 2017-06-13 | 1 | -0/+20 |
| | |||||
* | Refactor subscription to return zeroExSignature object | Leonid Logvinov | 2017-06-13 | 1 | -10/+16 |
| | |||||
* | Add getContractAddressAsync and tests | Leonid Logvinov | 2017-06-13 | 1 | -0/+7 |
| | |||||
* | Fix test | Leonid Logvinov | 2017-06-13 | 1 | -1/+1 |
| | |||||
* | Fix test | Leonid Logvinov | 2017-06-13 | 1 | -1/+1 |
| | |||||
* | Introduce index.ts file which defines public interface | Leonid Logvinov | 2017-06-13 | 7 | -12/+7 |
| | |||||
* | Change main file name from 0x.js.ts to 0x.ts | Leonid Logvinov | 2017-06-12 | 7 | -7/+7 |
| | |||||
* | Fix last tests | Leonid Logvinov | 2017-06-11 | 1 | -3/+3 |
| | |||||
* | Fix some tests | Leonid Logvinov | 2017-06-10 | 1 | -12/+12 |
| | |||||
* | Prefix private vars with _ | Leonid Logvinov | 2017-06-10 | 2 | -8/+8 |
| | |||||
* | Merge branch 'master' into subscribe-async-tests | Leonid | 2017-06-10 | 1 | -2/+1 |
|\ | |||||
| * | Merge branch 'master' into json-schema | Leonid | 2017-06-10 | 1 | -10/+258 |
| |\ | |||||
| * \ | Merge branch 'master' into json-schema | Leonid | 2017-06-10 | 1 | -3/+8 |
| |\ \ | |||||
| * | | | Fix tests | Leonid Logvinov | 2017-06-10 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into subscribe-async-tests | Leonid | 2017-06-10 | 1 | -10/+258 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-10 | 1 | -10/+20 |
| | | | | |||||
| * | | | Fix bugs in schemas | Leonid Logvinov | 2017-06-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into schema-tests | Leonid | 2017-06-10 | 1 | -3/+8 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into schema-tests | Leonid | 2017-06-09 | 1 | -0/+34 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fix tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add tests for fillOrderRequests schema | Leonid Logvinov | 2017-06-09 | 1 | -0/+26 |
| | | | | |||||
| * | | | Add tests for orderCancellationRequestsSchema | Leonid Logvinov | 2017-06-09 | 1 | -0/+26 |
| | | | | |||||
| * | | | Fix tests and add fillOrKillRequests schema | Leonid Logvinov | 2017-06-09 | 1 | -11/+37 |
| | | | | |||||
| * | | | Refactor tests | Leonid Logvinov | 2017-06-09 | 1 | -53/+47 |
| | | | | |||||
| * | | | Add tests for signedOrderSchema | Leonid Logvinov | 2017-06-09 | 1 | -0/+35 |
| | | | | |||||
| * | | | Add tests for order schema | Leonid Logvinov | 2017-06-09 | 1 | -0/+36 |
| | | | | |||||
| * | | | Tolerate more than one validation error in tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+5 |
| | | | | |||||
| * | | | Rename to validateAgainstSchema | Leonid Logvinov | 2017-06-09 | 1 | -11/+11 |
| | | | | |||||
| * | | | Add tests for TokenSchema | Leonid Logvinov | 2017-06-09 | 1 | -2/+37 |
| | | | | |||||
| * | | | Add ecSignatureSchema tests | Leonid Logvinov | 2017-06-09 | 1 | -36/+58 |
| | | | | |||||
| * | | | Add ecSignatureParameter test | Leonid Logvinov | 2017-06-09 | 1 | -0/+20 |
| | | | | |||||
| * | | | Add tests for address schema | Leonid Logvinov | 2017-06-09 | 1 | -7/+21 |
| | | | | |||||
* | | | | Merge branch 'master' into subscribe-async-tests | Leonid | 2017-06-10 | 1 | -3/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add test for zeroEx.exchange.getCanceledTakerAmountAsync | Leonid Logvinov | 2017-06-10 | 1 | -3/+8 |
| | |/ | |/| | |||||
* | | | Fix tests | Leonid Logvinov | 2017-06-10 | 1 | -4/+4 |
| | | | |||||
* | | | Remove only | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | | |||||
* | | | Add LogCancel test to subscribeAsync | Leonid Logvinov | 2017-06-09 | 1 | -2/+18 |
|/ / | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 2 | -52/+77 |
|\| | |||||
| * | Add orderFillOrKillRequestsSchema and validate using it instead of looping ↵ | Fabio Berger | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | | over the requests and validating them individually | ||||
| * | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 3 | -314/+254 |
| |\ | | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| * \ | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -0/+22 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -23/+72 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts | ||||
| * | | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 1 | -51/+76 |
| | | | | | |||||
* | | | | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -16/+18 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix isValidSignature tests | Fabio Berger | 2017-06-09 | 1 | -16/+18 |
| | | | | | |||||
* | | | | | Add tests for fillOrdersUpTo | Leonid Logvinov | 2017-06-09 | 1 | -0/+34 |
|/ / / / | |||||
* | | | | Merge pull request #48 from 0xProject/interfaceTweaks | Leonid | 2017-06-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Interface tweaks | ||||
| * \ \ \ | Merge branch 'master' into interfaceTweaks | Leonid | 2017-06-08 | 1 | -0/+22 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Make web3Wrapper protected instead of public | Fabio Berger | 2017-06-08 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #47 from 0xProject/is-valid-signature-contract | Leonid | 2017-06-08 | 2 | -121/+25 |
|\ \ \ \ | | | | | | | | | | | Refactor isValidSignature | ||||
| * \ \ \ | Merge branch 'master' into is-valid-signature-contract | Leonid | 2017-06-08 | 1 | -0/+22 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Fix linter error | Leonid Logvinov | 2017-06-08 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Rewrite isValidSignature tests | Leonid Logvinov | 2017-06-08 | 1 | -51/+25 |
| | | | | | |||||
| * | | | | Remove tests for isValidSignatureUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -78/+0 |
| | | | | | |||||
| * | | | | Refactor isValidSignature | Leonid Logvinov | 2017-06-08 | 1 | -13/+21 |
| | |/ / | |/| | | |||||
* | | | | Don't pass expressions as parameters | Leonid Logvinov | 2017-06-08 | 1 | -2/+4 |
| | | | | |||||
* | | | | Don't pass expressions as parameters | Leonid Logvinov | 2017-06-08 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 1 | -0/+22 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Add getOrderHashHexUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+22 |
| |/ / | |||||
* | | | Address feedback | Leonid Logvinov | 2017-06-08 | 2 | -7/+17 |
| | | | |||||
* | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 2 | -7/+79 |
|\| | | |||||
| * | | Format inputs | Leonid Logvinov | 2017-06-08 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 2 | -2/+100 |
| |\| | |||||
| | * | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 1 | -1/+1 |
| | | | |||||
| | * | Fix tests with removed shouldCheckTransfer | Fabio Berger | 2017-06-07 | 1 | -6/+3 |
| | | | |||||
| | * | merge master | Fabio Berger | 2017-06-07 | 2 | -5/+52 |
| | |\ | |||||
| | * | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -1/+102 |
| | | | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -8/+4 |
| | | | | |||||
* | | | | Add no-op test | Leonid Logvinov | 2017-06-08 | 1 | -3/+3 |
| | | | | |||||
* | | | | Add success test | Leonid Logvinov | 2017-06-08 | 2 | -5/+33 |
| | | | | |||||
* | | | | Remove only | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -12/+22 |
|\| | | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -11/+21 |
| | | | | |||||
| * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -23/+65 |
| | |/ | |/| | |||||
| * | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
| | | | |||||
* | | | Move fillableAmount to initialization section | Leonid Logvinov | 2017-06-07 | 1 | -8/+17 |
| | | | |||||
* | | | Move initialization up | Leonid Logvinov | 2017-06-07 | 1 | -15/+15 |
| | | | |||||
* | | | Move fillOrderAsync to fill order describe block | Leonid Logvinov | 2017-06-07 | 1 | -179/+185 |
| | | | |||||
* | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -23/+65 |
| | | | |||||
* | | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
|/ / | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
| | | |||||
* | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
* | | Remove only | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
* | | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 1 | -0/+5 |
| | | |||||
* | | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -1/+17 |
| | | |||||
* | | Merge branch 'master' into cancelAsync | Leonid Logvinov | 2017-06-06 | 2 | -3/+5 |
|\| | |||||
| * | Pass nonExistentSenderAddress so that we get the proper rejection | Fabio Berger | 2017-06-06 | 1 | -1/+2 |
| | | |||||
| * | avoid newline issues by putting the assertion message on a single line | Fabio Berger | 2017-06-06 | 1 | -2/+3 |
| | | |||||
* | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 2 | -4/+30 |
|/ | |||||
* | Update schema_test.ts | Leonid | 2017-06-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #39 from 0xProject/senderAccount | Leonid | 2017-06-06 | 5 | -57/+66 |
|\ | | | | | Make methods accept senderAccount | ||||
| * | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 1 | -3/+3 |
| | | |||||
| * | Last round of renamings | Leonid Logvinov | 2017-06-06 | 2 | -13/+13 |
| | | |||||
| * | Use variable name in assertin message | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Remove unused variable | Leonid Logvinov | 2017-06-06 | 1 | -1/+0 |
| | | |||||
| * | Rename accounts to addreses | Leonid Logvinov | 2017-06-06 | 3 | -3/+3 |
| | | |||||
| * | Remove message param from before | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
| * | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 1 | -3/+3 |
| | | |||||
| * | Add tests for isSenderAccountHexAsync | Leonid Logvinov | 2017-06-06 | 1 | -0/+33 |
| | | |||||
| * | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 4 | -57/+34 |
| | | |||||
* | | Merge pull request #35 from 0xProject/chai-setup | Leonid | 2017-06-06 | 5 | -18/+22 |
|\ \ | | | | | | | Add chai_setup | ||||
| * | | Update chai_setup.ts | Leonid | 2017-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into chai-setup | Leonid | 2017-06-06 | 2 | -4/+16 |
| |\ \ | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-06 | 5 | -12/+12 |
| | | | | |||||
| * | | | Add chai_setup | Leonid Logvinov | 2017-06-05 | 5 | -17/+22 |
| | |/ | |/| | |||||
* | | | Merge pull request #34 from 0xProject/number-regex | Leonid | 2017-06-06 | 1 | -0/+46 |
|\ \ \ | |_|/ |/| | | Add tests to number regex and BigNumber serialization & fix bugs | ||||
| * | | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -18/+23 |
| | | | |||||
| * | | Add tests to number regex and BigNumber serialization & fix bugs | Leonid Logvinov | 2017-06-05 | 1 | -0/+41 |
| |/ | |||||
* | | Merge pull request #38 from 0xProject/async-errors | Leonid | 2017-06-06 | 1 | -4/+6 |
|\ \ | | | | | | | Add a couple of awaits and returns for async tests | ||||
| * | | Add chai-as-promised | Leonid Logvinov | 2017-06-05 | 1 | -0/+2 |
| | | | |||||
| * | | Add a couple of awaits and returns for async tests | Leonid Logvinov | 2017-06-05 | 1 | -4/+4 |
| |/ | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -1/+2 |
| | | |||||
* | | Add regression test for transferFrom bug | Leonid Logvinov | 2017-06-05 | 1 | -0/+10 |
|/ | |||||
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 2 | -5/+87 |
|\ | | | | | Implement zeroEx.exchange.subscribeAsync | ||||
| * | remove space | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 2 | -9/+5 |
| |\ | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # test/exchange_wrapper_test.ts # test/utils/fill_scenarios.ts | ||||
| * \ | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -98/+252 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | -0/+25 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| * | | | | | Add tests for subscribeAsync, making sure events are caught and that ↵ | Fabio Berger | 2017-06-02 | 1 | -1/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | subscriptions are removed on provider change | ||||
| * | | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | if user updates the provider | ||||
| * | | | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 2 | -29/+80 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
* | \ \ \ \ \ | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 2 | -8/+96 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | ||||
| * | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelled | Leonid | 2017-06-03 | 2 | -8/+96 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Implement Unavailable, Filled and Cancelled | ||||
| | * | | | | | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 4 | -99/+249 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 2 | -29/+105 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| | * | | | | Simplify tests | Fabio Berger | 2017-06-02 | 1 | -16/+11 |
| | | | | | | |||||
| | * | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵ | Fabio Berger | 2017-06-02 | 2 | -8/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | and getCanceledTakerAmountAsync | ||||
* | | | | | | Fix bug | Fabio Berger | 2017-06-03 | 1 | -7/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 9 | -145/+536 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | ||||
| * | | | | | Add includeStack config to chai setup so that we get stackTraces | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | Fix undefined web3 issue | Fabio Berger | 2017-06-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-06-03 | 1 | -4/+12 |
| | | | | | |||||
| * | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 3 | -36/+34 |
| |\ \ \ \ | |||||
| | * | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -10/+10 |
| | | | | | | |||||
| | * | | | | Fix test name | Leonid Logvinov | 2017-06-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove spaces | Leonid Logvinov | 2017-06-03 | 1 | -3/+1 |
| | | | | | | |||||
| | * | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 1 | -13/+13 |
| | | | | | | |||||
| | * | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix ordering | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 1 | -21/+21 |
| | | | | | |||||
| * | | | | Rename coinBase to coinbase | Leonid Logvinov | 2017-06-02 | 2 | -12/+12 |
| | | | | | |||||
| * | | | | Refactor balance & allowance tests | Leonid Logvinov | 2017-06-02 | 1 | -47/+42 |
| | | | | | |||||
| * | | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 1 | -1/+44 |
| | | | | | |||||
| * | | | | Add success test for fill with fees | Leonid Logvinov | 2017-06-02 | 2 | -5/+33 |
| | | | | | |||||
| * | | | | Add token utils | Leonid Logvinov | 2017-06-02 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Add fill scenario with fees | Leonid Logvinov | 2017-06-02 | 2 | -10/+41 |
| | | | | | |||||
| * | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 2 | -18/+40 |
| | |/ / | |/| | | |||||
| * | | | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -0/+25 |
| | |/ | |/| | |||||
| * | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-02 | 1 | -0/+17 |
| |\ \ | |||||
| | * | | Add test for valid partial fill | Leonid Logvinov | 2017-06-02 | 1 | -0/+17 |
| | | | | |||||
| * | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵ | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
| |/ / | | | | | | | | | | undefined if non available | ||||
| * | | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -15/+32 |
| | | | |||||
| * | | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 2 | -16/+29 |
| |/ | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test | ||||
| * | Fix tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
| | | |||||
| * | Work | Leonid Logvinov | 2017-06-02 | 2 | -15/+30 |
| | | |||||
| * | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 2 | -37/+56 |
| | | |||||
| * | Change test name | Leonid Logvinov | 2017-06-02 | 1 | -3/+2 |
| | | |||||
| * | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -1/+2 |
| | | |||||
| * | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -7/+17 |
| | | |||||
| * | Revert "Add test to check the balance" | Leonid Logvinov | 2017-06-02 | 1 | -10/+0 |
| | | | | | | | | This reverts commit 389c18e98e2b5663b1732d7c34f9b21afef66e44. | ||||
| * | Add test to check the balance | Leonid Logvinov | 2017-06-01 | 1 | -0/+10 |
| | | |||||
| * | rename variable | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Follow constants convention | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Fix getOrderHashAsync test | Fabio Berger | 2017-06-01 | 1 | -0/+13 |
| | | |||||
| * | remove unused arg | Fabio Berger | 2017-06-01 | 2 | -7/+4 |
| | | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -15/+3 |
| |\ | |||||
| | * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | |\ | |||||
| | * | | Remove duplicate declarations | Leonid Logvinov | 2017-06-01 | 1 | -15/+3 |
| | | | | |||||
| * | | | Add missing comma and semi-colon | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵ | Fabio Berger | 2017-06-01 | 2 | -24/+23 |
| | |/ | |/| | | | | | | | artifacts | ||||
| * | | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| |/ | |||||
| * | get rid of literal amount params | Fabio Berger | 2017-06-01 | 1 | -6/+16 |
| | | |||||
| * | remove duplicate declarations | Fabio Berger | 2017-06-01 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -8/+18 |
| |\ | | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| | * | give some balance and allowance by default | Leonid Logvinov | 2017-06-01 | 1 | -5/+4 |
| | | | |||||
| | * | Add test, for throw when order is expired | Leonid Logvinov | 2017-06-01 | 1 | -3/+14 |
| | | | |||||
| * | | Add async suffix and fix alignment | Fabio Berger | 2017-06-01 | 1 | -9/+9 |
| |/ | |||||
| * | reorder variabled | Fabio Berger | 2017-06-01 | 1 | -3/+3 |
| | | |||||
| * | remove legacy code | Fabio Berger | 2017-06-01 | 1 | -1/+0 |
| | | |||||
| * | reorder import | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -9/+10 |
| |\ | |||||
| | * | Add shouldCheckTransfer | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | Refactor tests | Leonid Logvinov | 2017-06-01 | 1 | -10/+11 |
| | | | |||||
| * | | put external imports at the top | Fabio Berger | 2017-06-01 | 1 | -6/+6 |
| | | | |||||
| * | | remove comment | Fabio Berger | 2017-06-01 | 1 | -1/+0 |
| |/ | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -3/+7 |
| |\ | |||||
| | * | Add timestamp parameter to order factory | Leonid Logvinov | 2017-06-01 | 1 | -3/+7 |
| | | | |||||
| * | | Add comment for fillOrderAsync method, rename fillAmount to ↵ | Fabio Berger | 2017-06-01 | 1 | -3/+4 |
| |/ | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer | ||||
| * | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 2 | -29/+19 |
| | | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c. | ||||
| * | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 2 | -19/+29 |
| | | |||||
| * | Fix tests | Leonid Logvinov | 2017-06-01 | 1 | -8/+2 |
| | | |||||
| * | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -1/+10 |
| | | |||||
| * | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Add taker parameter to createSignedOrder | Leonid Logvinov | 2017-06-01 | 2 | -3/+6 |
| | | |||||
| * | Rename order to order_factory | Leonid Logvinov | 2017-06-01 | 2 | -1/+1 |
| | | |||||
| * | Remove unnecessary checks | Leonid Logvinov | 2017-06-01 | 1 | -5/+0 |
| | | |||||
| * | Fix linter errors | Leonid Logvinov | 2017-06-01 | 2 | -22/+24 |
| | | |||||
| * | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 1 | -0/+4 |
| | | |||||
| * | Allign parameters | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Use const | Leonid Logvinov | 2017-06-01 | 1 | -1/+1 |
| | | |||||
| * | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Temp push | Leonid Logvinov | 2017-06-01 | 2 | -55/+58 |
| | | |||||
| * | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -26/+28 |
| |\ |