crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
410 Commits 83 Branches 5,211 Tags
36e937f8de348cfdb35ff8f72504aed1dfab07b2
Commit Graph

217 Commits

Author SHA1 Message Date
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
Fabio Berger
bae4b1ee1b Fix comment 2017-06-02 20:33:58 +02:00
Fabio Berger
054797fa51 Add missing async suffix 2017-06-02 20:33:50 +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
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
Fabio Berger
0c98f4c754 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-02 18:34:24 +02:00
Fabio Berger
ebe5084876 Fix comment 2017-06-02 18:33:57 +02:00
Leonid Logvinov
16c296be14 Add ZRX_TOKEN_NOT_IN_REGISTRY 2017-06-02 18:14:51 +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
Leonid Logvinov
48d5c8b9b5 Remove protocol token artifacts 2017-06-02 16:47:38 +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
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
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
b983ce6312 Add ProtocolTokenArtifacts 2017-06-02 13:24:29 +02:00
Leonid Logvinov
e1ee6b8494 Add check for ROUNDING_ERROR and test for it 2017-06-02 12:57:21 +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
Leonid Logvinov
2a0c6abbe7 Validate maker balance and allowance & tests 2017-06-02 12:20:27 +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
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
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
Fabio Berger
a1be870585 Create a FillsScenario utils module and use it in the fillOrder tests 2017-06-01 19:47:22 +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
acb8a6c55e Merge branch 'fillOrderAsync' into unavailableFilledCancelled 
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	src/utils/assert.ts
 2017-06-01 18:14:17 +02:00