5149 Commits

Author SHA1 Message Date
Leonid Logvinov
72ca9a57de
Fix linter command 2017-05-31 14:12:14 +02:00
Leonid Logvinov
454c045838
Merge branch 'erc20transfer' into fillOrderAsync 2017-05-31 12:10:38 +02:00
Leonid
1958b28b96 Merge branch 'master' into erc20transfer 2017-05-31 11:18:42 +02:00
Leonid Logvinov
9409e0aba1
Add transfer function and tests for it 2017-05-31 11:16:57 +02:00
Fabio Berger
9364c5647f Merge pull request #26 from 0xProject/erc20Wrapper
Implement TokenWrapper functions & tests
2017-05-31 10:48:27 +02:00
Fabio Berger
2acdc627e2 Add TxOpts type 2017-05-31 10:43:09 +02:00
Fabio Berger
03072049d6 remove InternalError type since this error could surface through the public interface 2017-05-31 10:35:40 +02:00
Fabio Berger
d1d66f5635 Remove superfluous undefined check 2017-05-31 10:33:22 +02:00
Fabio Berger
274fe87da7 Add full stop to comments 2017-05-31 10:32:59 +02:00
Fabio Berger
6ea2c00099 Merge pull request #27 from 0xProject/yarn
Add yarn.lock
2017-05-30 19:33:48 +02:00
Leonid Logvinov
15295cdd3e
Add yarn.lock 2017-05-30 19:07:22 +02:00
Leonid Logvinov
be13cf127c
Refactor getOrderHash to accept order as an object 2017-05-30 17:35:17 +02:00
Leonid Logvinov
843ec2d4cf
Remove spaces in types 2017-05-30 17:06:38 +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
Fabio Berger
141d23f78a Implement setProxyAllowanceAsync 2017-05-30 16:30:29 +02:00
Leonid Logvinov
90caa189cc
Add first passing test 2017-05-30 16:19:35 +02:00
Leonid Logvinov
a4e5ec6c08
Add isBigNumber argument assertion 2017-05-30 15:58:51 +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
Fabio Berger
b5e496ea0f Implement zeroEx.token.getProxyAllowanceAsync 2017-05-30 15:27:51 +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
Fabio Berger
2f16c54835 rename ERC20Contract to TokenContract 2017-05-30 14:49:29 +02:00
Leonid Logvinov
dfcf49464b
Temporarily remove test 2017-05-30 14:49:04 +02:00
Leonid Logvinov
8c0d783ccc
Add throwErrorLogsAsErrors 2017-05-30 14:48:45 +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
6b321ca1c7 Remove mention of internal cleanup from public comment 2017-05-30 14:34:23 +02:00
Leonid
b0436a4f67 Merge pull request #25 from 0xProject/dontReinstantiateContractInstances
Add zeroEx.setProvider and clear contractInstances created with old provider
2017-05-30 14:31:37 +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
Leonid Logvinov
acd5fba133
Add order utils 2017-05-30 12:56:51 +02:00
Leonid Logvinov
76ddd12b4a
Fix order type 2017-05-30 12:56:28 +02:00
Leonid Logvinov
0b81cd9d78
Fix orderSchema 2017-05-30 12:56:11 +02:00
Fabio Berger
8561258ded Also test that web3Wrapper nested under tokenRegistryWrapper has updated provider 2017-05-30 12:56:10 +02:00
Leonid Logvinov
766d46041e
Add fillAmount parameter 2017-05-30 12:55:42 +02:00
Leonid Logvinov
968df3424c
Add copy_fixtures command 2017-05-30 12:55:00 +02:00
Fabio Berger
eefc8ca7ec add assertions that contractInstances are not undefined before provider update 2017-05-30 12:53:42 +02:00
Fabio Berger
007c57ec40 Also instantiate tokenRegistry contract instance 2017-05-30 12:52:28 +02:00
Fabio Berger
6aded80b2f remove unused import 2017-05-30 12:51:34 +02:00
Fabio Berger
3d3297834c remove unused declarations 2017-05-30 12:50:29 +02:00
Fabio Berger
f78f3b1bcd remove unused import 2017-05-30 12:48:46 +02:00
Fabio Berger
e2d0fd9cf9 remove unused import 2017-05-30 12:47:53 +02:00
Fabio Berger
b837021e6e improve comment 2017-05-30 12:47:46 +02:00
Fabio Berger
a3ce892f85 Make tokenRegistry contract instantiation lazy and clear it on provider update 2017-05-30 12:43:50 +02:00