220 Commits

Author SHA1 Message Date
Leonid Logvinov
7a21c6854b
Add option config for gasPrice and gasLimit for every transaction sending method 2017-11-27 17:35:55 -06:00
Leonid Logvinov
32867c9a07
Fix merge conflicts 2017-11-27 16:03:57 -06:00
Leonid
cf0a8b2d05
Merge branch 'development' into feature/passNetworkId 2017-11-27 15:53:21 -06:00
Fabio Berger
4e03155588 Add link to Provider explanation 2017-11-27 12:06:03 -06:00
Fabio Berger
ab78c54d6a Add comment about BlockParamLiteral explaining the omission of Earliest 2017-11-23 15:36:46 -06:00
Fabio Berger
8dea47f038 Merge branch 'development' into validateOrdersAgainstLatestBlock
* development:
  Rename removed to isRemoved
  Add CHANGELOG entry
  Make DecodedLogEvent contain web3 log under a log subkey
2017-11-23 15:24:32 -06:00
Fabio Berger
b7b1721145 Pass 'latest' to ExchangeTransferSimulator when used for validating orders, and pass 'pending' when used in the order watcher. 2017-11-23 15:21:45 -06:00
Fabio Berger
5068f1666a Remove Earliest from blockParamLiterals since specifying block 0 is trivial and this type can be reused in situations where the options are pending or latest 2017-11-23 15:20:20 -06:00
Leonid Logvinov
c780d04cee
Remove ContractDoesNotExist error and replace it with more specific errors 2017-11-23 15:15:47 -06:00
Leonid Logvinov
062f85e506
Pass networkId on provider update 2017-11-23 15:15:47 -06:00
Leonid Logvinov
3d11afd872
Remove outdated comment 2017-11-23 15:15:47 -06:00
Leonid Logvinov
96d15a8931
Improve a comment 2017-11-23 15:15:47 -06:00
Leonid Logvinov
50915e6007
Add a comment 2017-11-23 15:15:47 -06:00
Leonid Logvinov
52007e5864
Reuse the protected function to get contract address 2017-11-23 15:15:47 -06:00
Leonid Logvinov
0c74d5ba01
Move variable declaration inside the if 2017-11-23 15:15:47 -06:00
Leonid Logvinov
55ddf62df2
Fix rebasing issues 2017-11-23 15:15:17 -06:00
Leonid Logvinov
b3c01f6750
Revert "Remove redundant async"
This reverts commit 8d11ababd62d947e338757f57c41179510b11338.
2017-11-23 15:15:00 -06:00
Leonid Logvinov
34beee1edc
Refactor getContractAddress to contractWrapper 2017-11-23 15:15:00 -06:00
Leonid Logvinov
7bc6a7b23f
Remove redundant async 2017-11-23 15:13:38 -06:00
Leonid Logvinov
4a19655fb0
Fix the artifacts 2017-11-23 15:13:38 -06:00
Leonid Logvinov
010e6f8d7f
Fix the imports order 2017-11-23 15:13:37 -06:00
Leonid Logvinov
db2917b01c
Enable some new linter rules and fix the issues 2017-11-23 15:13:37 -06:00
Leonid Logvinov
87d34f9c7f
Auto-fix linter errors 2017-11-23 15:13:37 -06:00
Leonid Logvinov
c453099f6b
Fix linter issues 2017-11-23 15:13:37 -06:00
Leonid Logvinov
08569dbe6c
Await block reconcilation 2017-11-23 15:13:37 -06:00
Leonid Logvinov
a38ef3655b
Remove even more asyncs 2017-11-23 15:13:37 -06:00
Leonid Logvinov
c72745b0b2
Make zeroEx.tokenRegistry.getContractAddress non-async 2017-11-23 15:13:37 -06:00
Leonid Logvinov
8935146240
Make exchange subscriptions non-async 2017-11-23 15:13:37 -06:00
Leonid Logvinov
66aaceea91
Cleanup order watcher from redundant asyncs 2017-11-23 15:13:36 -06:00
Leonid Logvinov
4fe28ec53c
Make zeroEx.exchange.getContractAddress non-async 2017-11-23 15:13:36 -06:00
Leonid Logvinov
efe8e07854
Add ZRX artifacts 2017-11-23 15:13:36 -06:00
Leonid Logvinov
63dc606a9c
Make getZRXTokenAddress non async 2017-11-23 15:13:36 -06:00
Leonid Logvinov
131236305b
Store networkId in web3Wrapper 2017-11-23 15:13:36 -06:00
Leonid Logvinov
45c9171a2c
Add networkId to zeroExConfig schema 2017-11-23 15:13:36 -06:00
Leonid Logvinov
92efc65847
Add networkId to ZeroExConfig and make it required 2017-11-23 15:13:36 -06:00
Leonid Logvinov
fcd37808d4
Rename removed to isRemoved 2017-11-23 15:12:34 -06:00
Leonid Logvinov
e01468b492
Make DecodedLogEvent contain web3 log under a log subkey 2017-11-23 15:12:34 -06:00
Fabio Berger
f97074dc84
Merge pull request #230 from 0xProject/feature/removeDuplicateEvents
Add an order state cache to filter out duplicate events
2017-11-23 12:35:18 -06:00
Jacob Evans
924b96ce2a Fix nits 2017-11-23 15:14:33 +11:00
Jacob Evans
437ac301db
Merge branch 'development' into feature/calculate-remaining-proportions 2017-11-23 14:37:34 +11:00
Leonid Logvinov
ac2c723ec9
Last renames 2017-11-22 11:56:34 -06:00
Leonid Logvinov
3fc0eae4c0
Refactor while condition 2017-11-22 11:44:34 -06:00
Leonid
beed223281
Merge branch 'development' into feature/orderExpired 2017-11-22 11:24:59 -06:00
Jacob Evans
9c9ce97525 Perform the division last to not compound any errors 2017-11-22 11:08:39 +11:00
Jacob Evans
15628a1206 Add a test for when the ratio is < 1 2017-11-22 10:43:38 +11:00
Leonid Logvinov
8d6ba6ee7a
Rename toDecimal to hexToDecimal 2017-11-21 13:16:55 -06:00
Leonid Logvinov
c8c95b4bd2
Add postFormatter for logs 2017-11-21 13:09:23 -06:00
Leonid Logvinov
351b7557b6
Fix tests 2017-11-21 12:21:49 -06:00
Leonid Logvinov
4dc1962f9e
Fix a typo 2017-11-21 11:59:34 -06:00
Jacob Evans
d16f0508bd totalZRXTransferAmount -> totalZRXTransferAmountRequired 2017-11-21 14:57:08 +11:00