diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
| commit | 5aaf87d61260ec4723e7eb0a887629b057454957 (patch) | |
| tree | 0637dfabfec4e71f5cc7d3b2f46712572bb58ce0 /.gitignore | |
| parent | 10478a6b2fd1f2a01597a88afde9cf582640a849 (diff) | |
| parent | 96b31f39749fb32bd89978245c79aa637791336c (diff) | |
| download | dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.tar.gz dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.tar.zst dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.zip | |
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype:
Fix tslint issues
Fix tslint failure
Pass in fee and assetAmount rather then the whole signedOrder
Fix missing paths
Revert to returning orderState on invalid order
- Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming
Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 73b18e3f4..ed7a7b252 100644 --- a/.gitignore +++ b/.gitignore @@ -80,8 +80,8 @@ packages/order-watcher/test/artifacts/ packages/contract-wrappers/test/artifacts/ # generated contract wrappers -packages/0x.js/src/contract_wrappers/generated/ -packages/contracts/src/contract_wrappers/generated/ +packages/0x.js/src/generated_contract_wrappers/ +packages/contracts/src/generated_contract_wrappers/ packages/contract-wrappers/src/contract_wrappers/generated/ packages/metacoin/src/contract_wrappers packages/fill-scenarios/src/generated_contract_wrappers/ |