Fabio Berger
|
29955d3606
|
Fix import
|
2017-06-01 17:49:41 +02:00 |
|
Fabio Berger
|
85d4badbd6
|
remove unused arg
|
2017-06-01 17:39:58 +02:00 |
|
Fabio Berger
|
3a4020c78b
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 17:38:25 +02:00 |
|
Fabio Berger
|
35b7a60e97
|
Add missing comma and semi-colon
|
2017-06-01 17:38:20 +02:00 |
|
Fabio Berger
|
24a745092e
|
Stop passing exchangeAddress into getOrderHash and instead get it from the artifacts
|
2017-06-01 17:38:09 +02:00 |
|
Leonid Logvinov
|
39957df2c3
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 17:30:25 +02:00 |
|
Leonid Logvinov
|
ab5d999549
|
Remove duplicate declarations
|
2017-06-01 17:29:13 +02:00 |
|
Fabio Berger
|
7ff0f677a1
|
move external imports to top
|
2017-06-01 17:27:23 +02:00 |
|
Fabio Berger
|
1e8eb054bc
|
get rid of literal amount params
|
2017-06-01 17:25:33 +02:00 |
|
Fabio Berger
|
3e76497f4e
|
remove duplicate declarations
|
2017-06-01 17:19:06 +02:00 |
|
Fabio Berger
|
5888a03a02
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
# Conflicts:
# test/exchange_wrapper_test.ts
|
2017-06-01 17:17:32 +02:00 |
|
Fabio Berger
|
cc0d641107
|
Add async suffix and fix alignment
|
2017-06-01 17:16:16 +02:00 |
|
Leonid Logvinov
|
d1f352810f
|
give some balance and allowance by default
|
2017-06-01 17:13:15 +02:00 |
|
Leonid Logvinov
|
9a3cd3d06c
|
Add test, for throw when order is expired
|
2017-06-01 17:10:35 +02:00 |
|
Fabio Berger
|
bcc8e43ab8
|
reorder variabled
|
2017-06-01 17:08:44 +02:00 |
|
Fabio Berger
|
2c65a658e7
|
remove legacy code
|
2017-06-01 17:07:53 +02:00 |
|
Fabio Berger
|
00c597411f
|
reorder import
|
2017-06-01 17:07:43 +02:00 |
|
Fabio Berger
|
33940ec8fe
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 17:04:05 +02:00 |
|
Fabio Berger
|
60d658a024
|
put external imports at the top
|
2017-06-01 17:03:49 +02:00 |
|
Fabio Berger
|
59bc13c188
|
remove comment
|
2017-06-01 17:03:39 +02:00 |
|
Leonid Logvinov
|
af61b5a908
|
Add shouldCheckTransfer
|
2017-06-01 17:03:15 +02:00 |
|
Leonid Logvinov
|
5ded2bd52b
|
Refactor tests
|
2017-06-01 17:01:54 +02:00 |
|
Fabio Berger
|
8193d0f5b2
|
rename txData to txOpts
|
2017-06-01 16:55:34 +02:00 |
|
Fabio Berger
|
ea42715b9a
|
remove superfluous param
|
2017-06-01 16:54:20 +02:00 |
|
Fabio Berger
|
fe025506c9
|
remove unused arg
|
2017-06-01 16:30:06 +02:00 |
|
Fabio Berger
|
f756e1d24e
|
remove unneeded method
|
2017-06-01 16:25:37 +02:00 |
|
Fabio Berger
|
6c590354c7
|
improve comment
|
2017-06-01 16:25:28 +02:00 |
|
Fabio Berger
|
abd113f61f
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 16:21:09 +02:00 |
|
Fabio Berger
|
44f1144242
|
Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer
|
2017-06-01 16:21:01 +02:00 |
|
Leonid Logvinov
|
52bdc0d343
|
Add timestamp parameter to order factory
|
2017-06-01 16:17:15 +02:00 |
|
Leonid Logvinov
|
78259dc2af
|
Add expired check
|
2017-06-01 16:15:58 +02:00 |
|
Leonid Logvinov
|
7d64ce1220
|
Add EXPIRED error type
|
2017-06-01 16:15:30 +02:00 |
|
Leonid Logvinov
|
7fb18e512e
|
Increase mocha timeout
|
2017-06-01 16:14:32 +02:00 |
|
Leonid Logvinov
|
771c88ec79
|
Revert "Add EXPIRED test"
This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c.
|
2017-06-01 16:12:40 +02:00 |
|
Fabio Berger
|
a1041348d5
|
Get getSenderAddressOrThrowAsync everywhere where we throw if the senderAddress doesn't exist
|
2017-06-01 16:07:43 +02:00 |
|
Fabio Berger
|
88a70afa70
|
Add ExchangeContractErrs string enum
|
2017-06-01 16:03:09 +02:00 |
|
Fabio Berger
|
a685d7604f
|
fix formatting
|
2017-06-01 16:02:44 +02:00 |
|
Fabio Berger
|
73ad8378b0
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
|
2017-06-01 15:52:11 +02:00 |
|
Fabio Berger
|
6a57c42e25
|
Rename ExchangeContractErrs to ExchangeContractErrCodes
|
2017-06-01 15:51:45 +02:00 |
|
Leonid Logvinov
|
d8e35c364e
|
Add EXPIRED test
|
2017-06-01 15:46:27 +02:00 |
|
Leonid Logvinov
|
21d00f04d4
|
Fix tests
|
2017-06-01 15:21:24 +02:00 |
|
Leonid Logvinov
|
d5d20db439
|
Add NOT_A_TAKER check
|
2017-06-01 15:18:13 +02:00 |
|
Leonid Logvinov
|
07cdfa655b
|
Add FILL_AMOUNT_IS_ZERO check
|
2017-06-01 15:13:32 +02:00 |
|
Fabio Berger
|
88316455b7
|
Make taker required on Order object and expect NULL_ADDRESS from 0x.js
|
2017-06-01 15:10:22 +02:00 |
|
Fabio Berger
|
085e4fb896
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 14:59:26 +02:00 |
|
Fabio Berger
|
1668a08504
|
rename signed_order_schema to order_schemas
|
2017-06-01 14:59:03 +02:00 |
|
Leonid Logvinov
|
75d0b69db2
|
Add taker parameter to createSignedOrder
|
2017-06-01 14:57:34 +02:00 |
|
Leonid Logvinov
|
ef7ac6ac2d
|
Rename order to order_factory
|
2017-06-01 14:53:26 +02:00 |
|
Leonid Logvinov
|
448be396cb
|
Remove unnecessary checks
|
2017-06-01 14:52:25 +02:00 |
|
Fabio Berger
|
329d02053d
|
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
|
2017-06-01 14:46:39 +02:00 |
|