Fabio Berger
|
f25447aa3d
|
Merge branch 'master' into batchFillOrKill
|
2017-06-08 16:45:50 +02:00 |
|
Fabio Berger
|
2195bc6134
|
Merge pull request #46 from 0xProject/order-hash-contract
Add getOrderHashHexUsingContractCallAsync
|
2017-06-08 16:44:09 +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
|
c6645f9f4f
|
Merge pull request #43 from 0xProject/batchCancelAsync
Batch cancel order async
|
2017-06-08 11:17:04 +02:00 |
|
Leonid Logvinov
|
32ba65ee26
|
Address feedback
|
2017-06-08 11:16:06 +02:00 |
|
Leonid Logvinov
|
80294873c1
|
Format inputs
|
2017-06-08 11:09:55 +02:00 |
|
Leonid Logvinov
|
5ba4cd22e3
|
Address feedback
|
2017-06-08 10:58:14 +02:00 |
|
Leonid Logvinov
|
007102f2de
|
Don't use batch function for normal one
|
2017-06-08 10:52:07 +02:00 |
|
Leonid
|
41f005a676
|
Merge branch 'master' into batchCancelAsync
|
2017-06-07 21:45:18 +02:00 |
|
Leonid
|
834b28bfbe
|
Merge pull request #42 from 0xProject/addExchangeMethods
Add FillOrKillAsync method & tests
|
2017-06-07 19:01:17 +02:00 |
|
Fabio Berger
|
ca30835488
|
make txOpts optional
|
2017-06-07 17:54:27 +02:00 |
|
Fabio Berger
|
9e855b4c6a
|
Remove catch of invalid jump throws since there are many reasons the contracts could throw this error
|
2017-06-07 17:53:52 +02:00 |
|
Leonid Logvinov
|
7460acbc0b
|
Fix linter error
|
2017-06-07 17:53:45 +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 |
|
Fabio Berger
|
951d15b3ca
|
Spacing fix
|
2017-06-07 17:22:30 +02:00 |
|
Leonid Logvinov
|
3126279de7
|
Use batchCancel for normal cancel
|
2017-06-07 16:55:25 +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
|
9ae2e0c1ae
|
remove unused arg
|
2017-06-07 13:06:01 +02:00 |
|
Fabio Berger
|
8c81fab695
|
remove space
|
2017-06-07 13:05:52 +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
|
9325bd8cb4
|
Add initial batchCancelAsync implementation
|
2017-06-07 12:39:44 +02:00 |
|
Leonid
|
28d3528e42
|
Merge pull request #40 from 0xProject/cancelAsync
Add cancelOrderAsync
|
2017-06-07 12:22:05 +02:00 |
|
Leonid Logvinov
|
8ec2f685ab
|
Add comments for dates
|
2017-06-07 12:21:53 +02:00 |
|
Leonid Logvinov
|
09f67322f1
|
Remove assertions from utils methods
|
2017-06-07 12:20:28 +02:00 |
|
Leonid Logvinov
|
9a2a79a947
|
Use ContractInstance from globals
|
2017-06-07 12:16:07 +02:00 |
|
Leonid
|
cf76d1da5d
|
Update 0x.js.ts
|
2017-06-07 12:14:25 +02:00 |
|
Leonid Logvinov
|
498cc6cea1
|
Use union type Order|SignedOrder
|
2017-06-07 11:44:07 +02:00 |
|
Leonid Logvinov
|
02d36d7c9c
|
Make txOpts optional
|
2017-06-07 11:18:41 +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
|
bfa7872b14
|
Add missing semicolon
|
2017-06-06 17:38:03 +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 |
|
Leonid
|
8ec3bec5b3
|
Merge pull request #41 from 0xProject/testFixes
Fix Test Failures
|
2017-06-06 15:57:22 +02:00 |
|
Fabio Berger
|
db5d59b06e
|
Pass nonExistentSenderAddress so that we get the proper rejection
|
2017-06-06 15:53:18 +02:00 |
|
Leonid Logvinov
|
08b7c24bbf
|
Fix tests
|
2017-06-06 15:48:47 +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
|
f54b513935
|
Address feedback
|
2017-06-06 15:13:03 +02:00 |
|
Leonid Logvinov
|
0dfc2b5f3b
|
Add isAnyAddressAvailableAsync
|
2017-06-06 14:56:54 +02:00 |
|