Fabio Berger
|
f25447aa3d
|
Merge branch 'master' into batchFillOrKill
|
2017-06-08 16:45:50 +02:00 |
|
Leonid Logvinov
|
464e761053
|
Add getOrderHashHexUsingContractCallAsync
|
2017-06-08 12:03:14 +02:00 |
|
Fabio Berger
|
6e97489c1a
|
Merge branch 'master' into batchFillOrKill
# Conflicts:
# src/types.ts
|
2017-06-08 11:26:46 +02:00 |
|
Fabio Berger
|
8ab80914e0
|
Implement batchFillOrKill and tests
|
2017-06-08 11:25:47 +02:00 |
|
Leonid Logvinov
|
80294873c1
|
Format inputs
|
2017-06-08 11:09:55 +02:00 |
|
Leonid
|
41f005a676
|
Merge branch 'master' into batchCancelAsync
|
2017-06-07 21:45:18 +02:00 |
|
Leonid Logvinov
|
badbaa39fc
|
Address feedback
|
2017-06-07 17:46:55 +02:00 |
|
Fabio Berger
|
bc441015b6
|
add hex to function and variable name for clarity
|
2017-06-07 17:23:59 +02:00 |
|
Leonid Logvinov
|
c3cd5812e6
|
Refactor to use OrderCancellationRequest
|
2017-06-07 14:40:28 +02:00 |
|
Fabio Berger
|
d3a74e51e3
|
Fix tests with removed shouldCheckTransfer
|
2017-06-07 13:27:36 +02:00 |
|
Leonid Logvinov
|
91101eb8ec
|
Add tests for batchCancelAsync
|
2017-06-07 13:20:02 +02:00 |
|
Fabio Berger
|
4eee0b52f1
|
merge master
|
2017-06-07 12:48:26 +02:00 |
|
Fabio Berger
|
918315e89f
|
Implement fillOrKill & tests
|
2017-06-07 12:40:58 +02:00 |
|
Leonid Logvinov
|
8ec2f685ab
|
Add comments for dates
|
2017-06-07 12:21:53 +02:00 |
|
Leonid Logvinov
|
9daca6a4be
|
Address feedback
|
2017-06-07 11:04:42 +02:00 |
|
Leonid Logvinov
|
56dc33f3a6
|
Fix tests
|
2017-06-06 17:40:18 +02:00 |
|
Leonid Logvinov
|
c7c5ce3ef6
|
Remove only
|
2017-06-06 17:31:11 +02:00 |
|
Leonid Logvinov
|
42b4952693
|
Add test when the order was already cancelled or filled
|
2017-06-06 17:26:16 +02:00 |
|
Leonid Logvinov
|
fa910bca0e
|
Add checks and tests for expired order and zero fill amount
|
2017-06-06 16:57:13 +02:00 |
|
Leonid Logvinov
|
5412e80315
|
Merge branch 'master' into cancelAsync
|
2017-06-06 16:02:36 +02:00 |
|
Fabio Berger
|
db5d59b06e
|
Pass nonExistentSenderAddress so that we get the proper rejection
|
2017-06-06 15:53:18 +02:00 |
|
Fabio Berger
|
321e0765cb
|
avoid newline issues by putting the assertion message on a single line
|
2017-06-06 15:48:29 +02:00 |
|
Leonid Logvinov
|
8aa673aabe
|
Add initial implementation with success test
|
2017-06-06 15:36:07 +02:00 |
|
Leonid
|
403ec236ff
|
Update schema_test.ts
|
2017-06-06 15:28:13 +02:00 |
|
Leonid
|
692a0fd965
|
Merge pull request #39 from 0xProject/senderAccount
Make methods accept senderAccount
|
2017-06-06 15:14:53 +02:00 |
|
Leonid Logvinov
|
ef57dd22e2
|
Rename isSenderAddressHexAsync to isSenderAddressAsync
|
2017-06-06 14:29:07 +02:00 |
|
Leonid Logvinov
|
80bbfc3f0f
|
Last round of renamings
|
2017-06-06 14:10:36 +02:00 |
|
Leonid
|
2eb99f46f5
|
Merge pull request #35 from 0xProject/chai-setup
Add chai_setup
|
2017-06-06 14:05:01 +02:00 |
|
Leonid
|
fee0e5bfc7
|
Update chai_setup.ts
|
2017-06-06 14:04:01 +02:00 |
|
Leonid
|
bf66a43ca8
|
Merge pull request #34 from 0xProject/number-regex
Add tests to number regex and BigNumber serialization & fix bugs
|
2017-06-06 13:59:25 +02:00 |
|
Leonid
|
d1d5477e8d
|
Merge branch 'master' into chai-setup
|
2017-06-06 13:45:25 +02:00 |
|
Leonid Logvinov
|
abd6fbfa64
|
Use variable name in assertin message
|
2017-06-06 12:50:18 +02:00 |
|
Leonid Logvinov
|
33cf004b29
|
Remove unused variable
|
2017-06-06 12:48:40 +02:00 |
|
Leonid Logvinov
|
67e2208a18
|
Rename accounts to addreses
|
2017-06-06 12:48:00 +02:00 |
|
Leonid Logvinov
|
279790117b
|
Remove message param from before
|
2017-06-06 12:43:20 +02:00 |
|
Leonid Logvinov
|
ed3d1a8142
|
Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync
|
2017-06-06 12:37:52 +02:00 |
|
Leonid
|
b1ecb45f1b
|
Merge pull request #38 from 0xProject/async-errors
Add a couple of awaits and returns for async tests
|
2017-06-06 11:39:03 +02:00 |
|
Leonid Logvinov
|
39958be0b8
|
Address feedback
|
2017-06-06 11:38:29 +02:00 |
|
Leonid Logvinov
|
1c7229d783
|
Address feedback
|
2017-06-06 11:35:42 +02:00 |
|
Leonid Logvinov
|
aeec2a96b0
|
Address feedback
|
2017-06-06 11:28:11 +02:00 |
|
Leonid Logvinov
|
d36fa17153
|
Add tests for isSenderAccountHexAsync
|
2017-06-06 11:08:48 +02:00 |
|
Leonid Logvinov
|
bac6833436
|
Make methods accept senderAccount
|
2017-06-05 16:22:56 +02:00 |
|
Leonid Logvinov
|
713ad291c4
|
Add chai-as-promised
|
2017-06-05 15:31:39 +02:00 |
|
Leonid Logvinov
|
592cab8d3f
|
Add a couple of awaits and returns for async tests
|
2017-06-05 14:12:20 +02:00 |
|
Leonid Logvinov
|
38cf621327
|
Add regression test for transferFrom bug
|
2017-06-05 13:13:04 +02:00 |
|
Leonid Logvinov
|
4dc9a14aaf
|
Add chai_setup
|
2017-06-05 13:07:26 +02:00 |
|
Leonid Logvinov
|
2ac15caf00
|
Add tests to number regex and BigNumber serialization & fix bugs
|
2017-06-05 12:31:13 +02:00 |
|
Fabio Berger
|
3d75a50235
|
Merge pull request #32 from 0xProject/addEventSubscriptions
Implement zeroEx.exchange.subscribeAsync
|
2017-06-02 21:18:02 +02:00 |
|
Fabio Berger
|
36e937f8de
|
Merge branch 'master' into remainingTokenMethods
# Conflicts:
# src/contract_wrappers/token_wrapper.ts
|
2017-06-02 20:39:02 +02:00 |
|
Fabio Berger
|
c6ceb44682
|
Fix bug
|
2017-06-02 20:34:16 +02:00 |
|