Fabio Berger
4cfeb6b8ac
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
...
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
Rename some variables in multi_sig_with_time_lock.ts
Remove extra awaitTransactionMinedAsync calls
Apply changes to test/exchange/match_orders.ts
Fix some unhandled promise rejections
Add awaitTransactionMinedAsync after every sent transaction
Add missing blockchainLifecycle calls to contracts tests
2018-05-22 11:58:50 -07:00
Fabio Berger
9373451ca8
Fix tslint issues
2018-05-22 11:58:42 -07:00
Fabio Berger
15c199d5a2
Add are to boolean naming conventions
2018-05-22 11:58:35 -07:00
Alex Browne
cde85243d6
Merge pull request #601 from 0xProject/contracts-test-fixes
...
Contracts test fixes
2018-05-22 11:48:41 -07:00
Fabio Berger
c579db1a7b
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
...
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
Update artifacts
Update yarn.lock
Fix warnings in Metacoin
Upgrade UglifyJS to include ES6 support
Add CancelOrder and MatchOrder types
Add missing return types
Ignore classnames linter rule
2018-05-22 11:42:58 -07:00
Fabio Berger
61fa34e2ce
Fix tslint
2018-05-22 11:42:52 -07:00
Fabio Berger
96febf6639
Merge pull request #605 from 0xProject/fix/multiple/build-errors
...
Fix build/lint errors and warnings
2018-05-22 11:40:27 -07:00
Fabio Berger
09e59cf677
Fix the tsutils version, fixing ts typings issue
2018-05-22 11:23:14 -07:00
Alex Browne
e26c0c58ae
Rename some variables in multi_sig_with_time_lock.ts
2018-05-22 11:02:29 -07:00
Alex Browne
187fa71526
Remove extra awaitTransactionMinedAsync calls
2018-05-22 10:58:34 -07:00
Fabio Berger
4a0c8d72b0
merge development
2018-05-22 09:25:02 -07:00
Fabio Berger
ab9cfd293b
remove generated contract_wrappers during clean
2018-05-22 09:21:20 -07:00
Fabio Berger
cc840a6911
Merge pull request #594 from 0xProject/improvement/addCustomTslintRules
...
Add more tslint rules
2018-05-22 18:04:50 +02:00
Remco Bloemen
5456187dd0
Update artifacts
2018-05-22 17:13:04 +02:00
Remco Bloemen
73c95c328d
Update yarn.lock
2018-05-22 17:08:47 +02:00
Remco Bloemen
4a971be168
Fix warnings in Metacoin
2018-05-22 15:19:40 +02:00
Remco Bloemen
f657a3d811
Upgrade UglifyJS to include ES6 support
2018-05-22 15:19:40 +02:00
Remco Bloemen
b39f75a2e3
Add CancelOrder and MatchOrder types
2018-05-22 15:15:14 +02:00
Remco Bloemen
1dad14f8ea
Add missing return types
2018-05-22 13:50:07 +02:00
Remco Bloemen
5cc2e8de7b
Ignore classnames linter rule
2018-05-22 13:45:18 +02:00
Fabio Berger
c4a2f70017
Make lint run in parallel
2018-05-21 18:36:06 -07:00
Alex Browne
a5d315ee2a
Apply changes to test/exchange/match_orders.ts
2018-05-21 16:58:29 -07:00
Alex Browne
4fa57f55e6
Fix some unhandled promise rejections
2018-05-21 16:52:49 -07:00
Alex Browne
2c496a92ad
Add awaitTransactionMinedAsync after every sent transaction
2018-05-21 16:52:49 -07:00
Alex Browne
4ca8903a21
Add missing blockchainLifecycle calls to contracts tests
2018-05-21 16:52:49 -07:00
Greg Hysen
d460c0e8b9
Merge pull request #572 from 0xProject/feature/contracts/atomicMatching
...
Atomic Order Matching
2018-05-21 14:29:56 -07:00
Greg Hysen
11b6d290da
Removed debug line from chai_setup. Its failing linter and does not appear to be used (it was from an old PR I merged in).
2018-05-21 14:25:39 -07:00
Greg Hysen
d83902834f
Ran prettier
2018-05-21 13:54:11 -07:00
Fabio Berger
0fdf32cf6f
merge development
2018-05-21 13:38:12 -07:00
Greg Hysen
f4ebbfabf4
Added getNullFillResults
2018-05-18 17:07:00 -07:00
Greg Hysen
b5bcfc8fe7
orderFilledAmount -> orderTakerAssetFilledAmount
2018-05-18 17:07:00 -07:00
Greg Hysen
d13c08cc0d
Style improvements to order matching
2018-05-18 17:07:00 -07:00
Greg Hysen
89abd76570
Upgraded to Solidity 0.4.24
2018-05-18 17:07:00 -07:00
Greg Hysen
8c1ae35088
Rebased against v2-prototype
2018-05-18 17:05:36 -07:00
Greg Hysen
bb74789b42
Changed calculateFillResults to public visibility so that it can be used by the Forwarding Contract.
2018-05-18 17:01:06 -07:00
Greg Hysen
dbbd32d2ce
Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, we dont need to pass it in on each call.
2018-05-18 17:01:06 -07:00
Greg Hysen
80285a300d
Wording of calculateMatchedFillResults
2018-05-18 17:01:06 -07:00
Greg Hysen
2eb5819851
Cleaned up interface for decoding proxy data. Added a general decoder, which should be useful for the forwarding contract code.
2018-05-18 17:01:06 -07:00
Greg Hysen
e748e1891b
Style improvements to the match orders typescript test class
2018-05-18 17:01:06 -07:00
Greg Hysen
28bb11217c
Removed redundant log decode call
2018-05-18 17:01:06 -07:00
Greg Hysen
636dae6a79
The OrderInfo struct is now returned by the getOrderInfo function
2018-05-18 17:01:06 -07:00
Greg Hysen
c8f65a1bf9
Updated order of settleMatchedOrders to align with settleOrder
2018-05-18 17:01:06 -07:00
Greg Hysen
ce177ae6f6
IExchange inherits from all other interfaces (in the same order as Exchange inherits Mixins)
2018-05-18 17:01:06 -07:00
Greg Hysen
c79f3501cd
Renamed takerAssetFilledAmount to orderFilledAmount to more easily distinguish between fill results and order state
2018-05-18 17:01:06 -07:00
Greg Hysen
80114edc71
Comments for readability in exchange core and mixin match orders
2018-05-18 17:01:06 -07:00
Greg Hysen
71483e2865
Renamed "validate" functions to "assert" in mixin match.
2018-05-18 17:01:06 -07:00
Greg Hysen
93087324d9
Throw if the left or right orders do not compute the correct fill results. I like this better than just logging an error and failing silently.
2018-05-18 17:01:06 -07:00
Greg Hysen
061facdcce
Removed redundant status checks in matchOrders. Saves gas, plus follows pattern of fillOrder more closely.
2018-05-18 17:01:06 -07:00
Greg Hysen
3e6e7fb272
Token -> Asset in fillOrder spec
2018-05-18 17:01:06 -07:00
Greg Hysen
12d8c2398f
Reordered functions in mixin exchange core -- getOrderInfo is at the bottom
2018-05-18 17:01:06 -07:00
