Fabio Berger
|
38c48eb226
|
Improve fillOrderAsync comment
|
2017-06-02 17:02:16 +02:00 |
|
Fabio Berger
|
166de5da02
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-02 16:54:28 +02:00 |
|
Fabio Berger
|
ade4204743
|
Improve error names and remove duplicate import
|
2017-06-02 16:54:21 +02:00 |
|
Fabio Berger
|
00fde26a54
|
Improve comment
|
2017-06-02 16:54:05 +02:00 |
|
Fabio Berger
|
dea6406a5f
|
remove ProtocolToken
|
2017-06-02 16:53:56 +02:00 |
|
Leonid Logvinov
|
48d5c8b9b5
|
Remove protocol token artifacts
|
2017-06-02 16:47:38 +02:00 |
|
Fabio Berger
|
3de6559547
|
remove unneeded calls to toBaseUnitAmount
|
2017-06-02 16:38:17 +02:00 |
|
Fabio Berger
|
53af22a844
|
pass numbers to BigNumber unless it's too big for the number type
|
2017-06-02 16:36:25 +02:00 |
|
Fabio Berger
|
563d0ca4a2
|
use BigNumber(0) instead of with a string zero
|
2017-06-02 16:33:10 +02:00 |
|
Leonid Logvinov
|
e77f004b70
|
Merge branch 'master' into fillOrderAsync
|
2017-06-02 16:30:10 +02:00 |
|
Fabio Berger
|
21292ad15e
|
Add balance check to transferAsync and related test
|
2017-06-02 16:29:12 +02:00 |
|
Leonid Logvinov
|
3c71506022
|
Rename coinBase to coinbase
|
2017-06-02 16:26:47 +02:00 |
|
Leonid Logvinov
|
07c61b1f9b
|
Refactor balance & allowance tests
|
2017-06-02 16:25:05 +02:00 |
|
Fabio Berger
|
aed96d593d
|
Improve comment
|
2017-06-02 16:23:42 +02:00 |
|
Leonid Logvinov
|
c650d1ba20
|
Add tests and checks for fees balances and allowances
|
2017-06-02 16:18:54 +02:00 |
|
Fabio Berger
|
eeac90c1a2
|
Add tests for transferFromAsync, setAllowanceAsync and getAllowanceAsync and fix up other test issues
|
2017-06-02 16:16:31 +02:00 |
|
Fabio Berger
|
844f138908
|
Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper
|
2017-06-02 16:06:26 +02:00 |
|
Fabio Berger
|
b8ff246877
|
Fix tslint issues
|
2017-06-02 15:56:21 +02:00 |
|
Leonid Logvinov
|
d8587875b8
|
Add success test for fill with fees
|
2017-06-02 15:24:42 +02:00 |
|
Leonid Logvinov
|
a07a9d8571
|
Add token utils
|
2017-06-02 15:24:11 +02:00 |
|
Leonid Logvinov
|
b983ce6312
|
Add ProtocolTokenArtifacts
|
2017-06-02 13:24:29 +02:00 |
|
Leonid Logvinov
|
832d2ff5ca
|
Add fill scenario with fees
|
2017-06-02 13:08:59 +02:00 |
|
Leonid Logvinov
|
e1ee6b8494
|
Add check for ROUNDING_ERROR and test for it
|
2017-06-02 12:57:21 +02:00 |
|
Fabio Berger
|
6f98d83284
|
Merge branch 'fillOrderAsync' into addEventSubscriptions
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
|
2017-06-02 12:42:31 +02:00 |
|
Fabio Berger
|
ab5b5a881b
|
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
# Conflicts:
# src/0x.js.ts
# test/exchange_wrapper_test.ts
|
2017-06-02 12:40:22 +02:00 |
|
Fabio Berger
|
efcfa1af70
|
Add tests for subscribeAsync, making sure events are caught and that subscriptions are removed on provider change
|
2017-06-02 12:32:38 +02:00 |
|
Fabio Berger
|
fc3be810a2
|
Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions if user updates the provider
|
2017-06-02 12:31:16 +02:00 |
|
Leonid Logvinov
|
2a0c6abbe7
|
Validate maker balance and allowance & tests
|
2017-06-02 12:20:27 +02:00 |
|
Fabio Berger
|
104b7f2549
|
Merge branch 'fillOrderAsync' into addEventSubscriptions
# Conflicts:
# src/0x.js.ts
# test/exchange_wrapper_test.ts
|
2017-06-02 12:19:00 +02:00 |
|
Fabio Berger
|
9d9b6f7cc0
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-02 12:15:57 +02:00 |
|
Fabio Berger
|
fc7592d73f
|
Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or undefined if non available
|
2017-06-02 12:15:50 +02:00 |
|
Leonid Logvinov
|
4caf1b009e
|
Add test for valid partial fill
|
2017-06-02 12:08:25 +02:00 |
|
Fabio Berger
|
7b0341bc8a
|
Update artifacts
|
2017-06-02 12:04:38 +02:00 |
|
Leonid Logvinov
|
5155f49804
|
Add test for insufficient balance and make all async tests async
|
2017-06-02 12:03:52 +02:00 |
|
Leonid Logvinov
|
a740498c80
|
Introduce coinBase account
Add makerAccount parameter
Adjust tests
Add more assertions to success test
|
2017-06-02 11:23:39 +02:00 |
|
Fabio Berger
|
03bc3f08cd
|
Simplify tests
|
2017-06-02 10:02:19 +02:00 |
|
Fabio Berger
|
114b5ea0fe
|
improve comment
|
2017-06-02 09:59:10 +02:00 |
|
Fabio Berger
|
2cf5208f85
|
Add comment about the isString assertion lest the next developer tries to use a stricter assertion (i.e isHexString) which we intentionally did not do
|
2017-06-02 09:49:50 +02:00 |
|
Fabio Berger
|
707a5f55eb
|
Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCanceledTakerAmountAsync
|
2017-06-02 09:43:03 +02:00 |
|
Fabio Berger
|
293ce6f4b2
|
Always wrap BigNumbers returned by web3 with our own version and add comment
|
2017-06-02 09:39:05 +02:00 |
|
Fabio Berger
|
3e0c2ad753
|
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
|
2017-06-01 21:14:30 +02:00 |
|
Leonid Logvinov
|
f663a15c9b
|
Fix tests
|
2017-06-01 21:12:13 +02:00 |
|
Leonid Logvinov
|
511fa537ad
|
Work
|
2017-06-01 20:04:12 +02:00 |
|
Fabio Berger
|
a1be870585
|
Create a FillsScenario utils module and use it in the fillOrder tests
|
2017-06-01 19:47:22 +02:00 |
|
Leonid Logvinov
|
c42877327e
|
Change test name
|
2017-06-01 18:52:56 +02:00 |
|
Fabio Berger
|
aade6891e8
|
fix tslint error
|
2017-06-01 18:35:23 +02:00 |
|
Fabio Berger
|
2aaf71e488
|
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
|
2017-06-01 18:34:42 +02:00 |
|
Leonid Logvinov
|
520248e678
|
Make validateFillOrder asyncronous
|
2017-06-01 18:31:08 +02:00 |
|
Leonid Logvinov
|
0554f947b1
|
Add not enough taker balance tests
|
2017-06-01 18:21:12 +02:00 |
|
Fabio Berger
|
de93bf1690
|
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
|
2017-06-01 18:15:50 +02:00 |
|