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
|
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
|
771c88ec79
|
Revert "Add EXPIRED test"
This reverts commit d8e35c364e.
|
2017-06-01 16:12:40 +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 |
|
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 |
|
Leonid Logvinov
|
dbb30aa1dd
|
Fix linter errors
|
2017-06-01 11:46:57 +02:00 |
|
Leonid Logvinov
|
de3a2ff672
|
Add dirty-chai
|
2017-06-01 11:40:08 +02:00 |
|
Leonid Logvinov
|
0a68a69d0c
|
Allign parameters
|
2017-06-01 11:15:52 +02:00 |
|
Leonid Logvinov
|
cc7592e931
|
Use const
|
2017-06-01 11:07:58 +02:00 |
|
Leonid Logvinov
|
f450f538a0
|
Add setDefaultAccount
|
2017-06-01 11:07:36 +02:00 |
|
Leonid Logvinov
|
28dee77db8
|
Temp push
|
2017-05-31 21:15:15 +02:00 |
|
Leonid Logvinov
|
886ed9180d
|
Merge branch 'master' into fillOrderAsync
|
2017-05-31 19:26:18 +02:00 |
|
Leonid Logvinov
|
4d43f4d610
|
Address feedback
|
2017-05-31 17:54:01 +02:00 |
|
Leonid Logvinov
|
82a46b4938
|
Add setAllowance function
|
2017-05-31 17:45:15 +02:00 |
|
Leonid Logvinov
|
1955e90bbb
|
Fix linter errors
|
2017-05-31 16:15:16 +02:00 |
|
Leonid Logvinov
|
7d29fb2174
|
Remove debug output
|
2017-05-31 16:06:14 +02:00 |
|
Leonid Logvinov
|
84c652d205
|
Revert tests
|
2017-05-31 16:03:16 +02:00 |
|
Leonid Logvinov
|
7f269cd791
|
Add createSignedOrder function
|
2017-05-31 16:03:06 +02:00 |
|
Leonid Logvinov
|
454c045838
|
Merge branch 'erc20transfer' into fillOrderAsync
|
2017-05-31 12:10:38 +02:00 |
|
Leonid Logvinov
|
9409e0aba1
|
Add transfer function and tests for it
|
2017-05-31 11:16:57 +02:00 |
|
Leonid Logvinov
|
be13cf127c
|
Refactor getOrderHash to accept order as an object
|
2017-05-30 17:35:17 +02:00 |
|
Leonid Logvinov
|
68f39765aa
|
Remove fixture
|
2017-05-30 17:05:29 +02:00 |
|
Fabio Berger
|
5e6818d3ef
|
remove unused imports
|
2017-05-30 16:36:38 +02:00 |
|
Fabio Berger
|
8df2926a1a
|
Add test for setProxyAllowanceAsync and additional test for getProxyAllowanceAsync
|
2017-05-30 16:31:02 +02:00 |
|
Leonid Logvinov
|
90caa189cc
|
Add first passing test
|
2017-05-30 16:19:35 +02:00 |
|
Leonid Logvinov
|
18d6b3b86f
|
replace test fixture with the one from testrpc
|
2017-05-30 15:57:22 +02:00 |
|
Fabio Berger
|
f066b52143
|
remove spaces after it keyword
|
2017-05-30 15:28:45 +02:00 |
|
Fabio Berger
|
53e83a7d81
|
Add first test for getProxyAllowanceAsync
|
2017-05-30 15:28:21 +02:00 |
|
Leonid Logvinov
|
be4248f345
|
Fix import
|
2017-05-30 14:59:24 +02:00 |
|
Leonid Logvinov
|
3e65ac018c
|
Merge branch 'master' into fillOrderAsync
|
2017-05-30 14:55:43 +02:00 |
|
Fabio Berger
|
86cdb6cb83
|
use token instead of erc20
|
2017-05-30 14:53:25 +02:00 |
|
Leonid Logvinov
|
dfcf49464b
|
Temporarily remove test
|
2017-05-30 14:49:04 +02:00 |
|
Fabio Berger
|
2c3b718a4f
|
rename erc20Wrapper to tokenWrapper to be more generic in case we end up supporting another spec
|
2017-05-30 14:48:41 +02:00 |
|
Fabio Berger
|
1f09470838
|
Merge branch 'master' into erc20Wrapper
# Conflicts:
# src/0x.js.ts
|
2017-05-30 14:48:10 +02:00 |
|
Leonid Logvinov
|
18d65f5f55
|
Append _test to exchange_wrapper
|
2017-05-30 14:36:14 +02:00 |
|
Fabio Berger
|
3522f94ff6
|
use .be.undefined instead of .be.an('undefined')
|
2017-05-30 14:26:07 +02:00 |
|
Fabio Berger
|
ad14c307ce
|
Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that instantiates contract instance if not already instantiated
|
2017-05-30 14:23:44 +02:00 |
|