Commit Graph

335 Commits

Author SHA1 Message Date
Leonid Logvinov
3a4a3b9aa1 Fix merge problems 2017-07-03 14:35:13 -07:00
Leonid
86c742cb11 Merge branch 'master' into wrap-log-bignumber 2017-07-03 14:31:40 -07:00
Leonid
8204409c6d Merge branch 'master' into add-exchange-address-to-order-struct 2017-07-03 12:05:46 -07:00
Leonid Logvinov
0e54418dbb Wrap all event args in a newer version of BigNumber and test it 2017-07-01 19:44:17 -07:00
Leonid Logvinov
c0d4b30828 Assert correct event names in subscribeAsync tests 2017-07-01 08:39:57 -07:00
Leonid Logvinov
c5a93b0945 Fix comment 2017-06-30 14:21:58 -07:00
Leonid Logvinov
6aa37ad3e4 Add tests for getProxyAuthorizedContractAddressesAsync 2017-06-29 13:41:35 -07:00
Leonid Logvinov
1321ea5beb Remove unused code from test/proxy_wrapper_test.ts 2017-06-29 13:15:20 -07:00
Leonid Logvinov
7ca113b59b Add a test for a ProxyWrapper 2017-06-29 13:11:50 -07:00
Leonid Logvinov
fa3963199e Make zeroEx.getOrderHashHex non-async 2017-06-29 12:54:41 -07:00
Leonid Logvinov
e1e79519b9 Fix typo in getAvailableContractAddressesAsync 2017-06-29 12:54:03 -07:00
Leonid Logvinov
83bc740911 Make it clear that we are using a fake address in tests 2017-06-29 11:25:58 -07:00
Leonid Logvinov
91e2857645 Fix a typo in a name 2017-06-29 10:53:11 -07:00
Leonid Logvinov
e9db532727 Make getOrderHashHex a non-async function 2017-06-29 10:34:49 -07:00
Leonid Logvinov
de0e436aad Allow multiple exchange versions t be functional at the same time 2017-06-26 19:44:21 -07:00
Leonid
73eb78d793 Merge pull request #81 from 0xProject/addWrappedETHSupport
Add Wrapped ETH Support
2017-06-26 13:23:02 -07:00
Fabio Berger
41098c6a35 refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test assertions to check if the discrepancy between the existing ETH balance and expected balance is small enough to simply be the gas cost used by the transaction. 2017-06-26 11:20:16 -07:00
Fabio Berger
0f413febd3 Fix typo 2017-06-26 10:30:09 -07:00
Fabio Berger
60b3f3e6dd Implement EtherTokenWrapper and tests, with deposit and withdraw methods 2017-06-25 14:50:11 -07:00
Leonid Logvinov
75ae305a6e Rename KOVAN_URL to KOVAN_RPC_URL 2017-06-23 17:10:43 +02:00
Leonid Logvinov
845aee35d3 Simplify integration tests 2017-06-23 12:12:16 +02:00
Leonid Logvinov
3f962585e9 Refactor KOVAN_URL to constants and fetch mnemonic from package.json 2017-06-23 12:03:40 +02:00
Leonid Logvinov
dcd08e40e6 Add kovan integration tests 2017-06-22 23:36:43 +02:00
Leonid
e5785532ed Merge branch 'master' into fill-order-amuont 2017-06-22 22:50:16 +02:00
Leonid
94cab6f694 Revert "Use different lodash import syntax which allows to include only used functions" 2017-06-22 16:21:56 +02:00
Leonid Logvinov
bd9fa3d335 Add test for return amount from fillOrdersUpToAsync 2017-06-22 14:15:35 +02:00
Leonid Logvinov
b28b0fad7a Add test for cancelOrderAsync return value 2017-06-22 13:45:43 +02:00
Leonid Logvinov
d088dcdd36 Add simple test checking that fillOrderAsync return filled amount 2017-06-22 00:16:35 +02:00
Leonid Logvinov
42c61ecda5 Return filledAmount from fillOrderAsync 2017-06-21 17:55:21 +02:00
Leonid Logvinov
a1c363a8af Fall back to import x = require() syntax 2017-06-21 14:11:06 +02:00
Leonid Logvinov
40a7be0690 Use different lodash import syntax which allows to include only used functions 2017-06-21 13:56:14 +02:00
Leonid Logvinov
38170a24ed Fix bug in 0x.js tests when passing Web3 instead of Web3 Provider 2017-06-15 17:34:54 +02:00
Leonid Logvinov
d789aa24aa Make ZeroEx constructor accept Web3Provider instead of Web3 instance 2017-06-15 17:05:03 +02:00
Leonid Logvinov
ba289c2843 Remove types that are not used in public interface from export and rename EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues 2017-06-14 11:27:33 +02:00
Leonid Logvinov
ac8116bbe4 Address feedback 2017-06-13 18:08:18 +02:00
Leonid Logvinov
96a93c4b35 Add tests for stopWatchingAsync 2017-06-13 17:39:43 +02:00
Leonid Logvinov
6ad1900ada Refactor subscription to return zeroExSignature object 2017-06-13 15:52:50 +02:00
Leonid Logvinov
52dc6b7710 Add getContractAddressAsync and tests 2017-06-13 13:29:02 +02:00
Leonid Logvinov
6cdd90e18b Fix test 2017-06-12 19:03:16 +02:00
Leonid Logvinov
7cf31db20e Fix test 2017-06-12 18:57:54 +02:00
Leonid Logvinov
365548e126 Introduce index.ts file which defines public interface 2017-06-12 18:20:43 +02:00
Leonid Logvinov
672d5aae5d Change main file name from 0x.js.ts to 0x.ts 2017-06-12 11:33:35 +02:00
Leonid Logvinov
6b152edb98 Fix last tests 2017-06-11 13:14:46 +02:00
Leonid Logvinov
fad23af55e Fix some tests 2017-06-10 16:07:03 +02:00
Leonid Logvinov
d727bed6ab Prefix private vars with _ 2017-06-10 15:36:52 +02:00
Leonid
1cff9fdf77 Merge branch 'master' into subscribe-async-tests 2017-06-10 12:23:41 +02:00
Leonid
823134b3bf Merge branch 'master' into json-schema 2017-06-09 20:40:36 +02:00
Leonid
81e3b180a9 Merge branch 'master' into subscribe-async-tests 2017-06-09 20:40:23 +02:00
Leonid Logvinov
ba27da965b Address feedback 2017-06-09 20:11:56 +02:00
Leonid Logvinov
727f6ad230 Fix bugs in schemas 2017-06-09 20:04:10 +02:00