432 Commits

Author SHA1 Message Date
Leonid Logvinov
aeec2a96b0
Address feedback 2017-06-06 11:28:11 +02:00
Leonid Logvinov
4dc9a14aaf
Add chai_setup 2017-06-05 13:07:26 +02:00
Leonid Logvinov
eb5c9ae708
Upgrade truffle-contract to the version that includes 'at' fix 2017-06-05 11:48:41 +02:00
Leonid
63854603e1 Merge pull request #33 from 0xProject/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2017-06-03 16:18:46 +02:00
Fabio Berger
3d75a50235 Merge pull request #32 from 0xProject/addEventSubscriptions
Implement zeroEx.exchange.subscribeAsync
2017-06-02 21:18:02 +02:00
Leonid
88815e5b45 Merge pull request #29 from 0xProject/remainingTokenMethods
Implement Remaining Token Methods
2017-06-02 21:01:58 +02:00
Fabio Berger
2e5e8c8987 Consolidate the ExchangeContract type and flesh out type definition for isValidSignature.call 2017-06-02 20:54:44 +02:00
Fabio Berger
3e115eab4a Run stopWatching in parallel 2017-06-02 20:49:44 +02:00
Fabio Berger
78d7febede Be more specific with blockParam valid values 2017-06-02 20:46:27 +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
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
bef967f405 remove space 2017-06-02 20:22:25 +02:00
Fabio Berger
c90ffd92a5 Update artifacts 2017-06-02 20:22:10 +02:00
greenkeeper[bot]
abe65f0ce3 docs(readme): add Greenkeeper badge 2017-06-02 18:06:05 +00:00
Fabio Berger
45f9ffd86c Merge branch 'master' into addEventSubscriptions
# Conflicts:
#	src/types.ts
#	test/exchange_wrapper_test.ts
#	test/utils/fill_scenarios.ts
2017-06-02 20:05:25 +02:00
greenkeeper[bot]
d488dd79ed chore(package): update dependencies 2017-06-02 18:02:49 +00:00
Fabio Berger
40208e3b2d Merge branch 'master' into addEventSubscriptions 2017-06-02 20:01:29 +02:00
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