Fabio Berger
|
1a52c43288
|
Revert unintentional artifact changes
|
2017-06-02 19:58:02 +02:00 |
|
Leonid
|
5925f81fe1
|
Merge pull request #31 from 0xProject/unavailableFilledCancelled
Implement Unavailable, Filled and Cancelled
|
2017-06-02 19:53:01 +02:00 |
|
Leonid Logvinov
|
2ff8f4ca6e
|
Use forked version of chai-bignumber while the PR is waiting for a review
|
2017-06-02 19:52:23 +02:00 |
|
Fabio Berger
|
1443c0838c
|
Merge branch 'master' into remainingTokenMethods
# Conflicts:
# src/types.ts
# src/web3_wrapper.ts
|
2017-06-02 19:45:57 +02:00 |
|
Fabio Berger
|
d4320fec72
|
Add includeStack config to chai setup so that we get stackTraces
|
2017-06-02 19:38:28 +02:00 |
|
Fabio Berger
|
ae15425f0b
|
Merge branch 'master' into addEventSubscriptions
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
# src/types.ts
# test/exchange_wrapper_test.ts
|
2017-06-02 19:14:20 +02:00 |
|
Fabio Berger
|
35c9330d62
|
Merge branch 'master' into unavailableFilledCancelled
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
# src/types.ts
# test/exchange_wrapper_test.ts
|
2017-06-02 19:03:53 +02:00 |
|
Leonid
|
c83587a16d
|
Merge pull request #30 from 0xProject/fillOrderAsync
fillOrderAsync
|
2017-06-02 18:53:21 +02:00 |
|
Fabio Berger
|
3fad55d118
|
Fix undefined web3 issue
|
2017-06-02 18:46:47 +02:00 |
|
Leonid Logvinov
|
45c4f203df
|
Fix linter errors
|
2017-06-02 18:37:38 +02:00 |
|
Leonid Logvinov
|
9620b18fec
|
Address feedback
|
2017-06-02 18:37:25 +02:00 |
|
Fabio Berger
|
0c98f4c754
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-02 18:34:24 +02:00 |
|
Fabio Berger
|
3551f07914
|
Fix ordering
|
2017-06-02 18:34:18 +02:00 |
|
Fabio Berger
|
ebe5084876
|
Fix comment
|
2017-06-02 18:33:57 +02:00 |
|
Leonid Logvinov
|
cc6b27cbb1
|
Address feedback
|
2017-06-02 18:24:24 +02:00 |
|
Leonid Logvinov
|
7cf60b589b
|
Address feedback
|
2017-06-02 18:20:17 +02:00 |
|
Leonid Logvinov
|
a52f834deb
|
Fix test name
|
2017-06-02 18:16:55 +02:00 |
|
Leonid Logvinov
|
16c296be14
|
Add ZRX_TOKEN_NOT_IN_REGISTRY
|
2017-06-02 18:14:51 +02:00 |
|
Leonid Logvinov
|
199843718f
|
Remove spaces
|
2017-06-02 18:13:22 +02:00 |
|
Leonid Logvinov
|
76280dd5db
|
Address feedback
|
2017-06-02 18:10:06 +02:00 |
|
Leonid Logvinov
|
45fadeb690
|
Allign arguments
|
2017-06-02 18:06:06 +02:00 |
|
Leonid Logvinov
|
89d9349478
|
Rewrite comment
|
2017-06-02 18:05:27 +02:00 |
|
Leonid Logvinov
|
abf2cf4c5e
|
Move FillOrderValidatinErrs to ExchangeContractErrs
|
2017-06-02 18:00:37 +02:00 |
|
Leonid Logvinov
|
54e8bf7730
|
Assign wouldRoundingErrorOccur to a variable
|
2017-06-02 17:41:23 +02:00 |
|
Leonid Logvinov
|
7fd84e29ab
|
Rename EXPIRED to FILL_ORDER_EXPIRED
|
2017-06-02 17:40:06 +02:00 |
|
Leonid Logvinov
|
f5158eebf3
|
Assign timestamp to a variable
|
2017-06-02 17:39:21 +02:00 |
|
Leonid Logvinov
|
e5cc0e0562
|
Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER
|
2017-06-02 17:38:47 +02:00 |
|
Leonid Logvinov
|
0f7bd05972
|
Don't pass zrxTokenAsign
|
2017-06-02 17:37:28 +02:00 |
|
Leonid Logvinov
|
ef3a27ed05
|
Rename validation functions
|
2017-06-02 17:35:05 +02:00 |
|
Leonid Logvinov
|
9756aa86b0
|
Add getZRXTokenAddressAsync
|
2017-06-02 17:34:01 +02:00 |
|
Fabio Berger
|
827a0d4e91
|
rename fillTakerAmountInBaseUnits to fillTakerAmount
|
2017-06-02 17:03:36 +02:00 |
|
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 |
|