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 |
|
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 |
|
Greg Hysen
|
bb73963421
|
Changes based on style guidelines put out by Amir
|
2018-05-18 17:01:06 -07:00 |
|
Greg Hysen
|
1dd7688bdd
|
Reordered fund transfers for matched orders, plus added an extra sanity check to order matching calculations
|
2018-05-18 17:01:06 -07:00 |
|
Greg Hysen
|
5735095521
|
Style changes to atomic order matching
|
2018-05-18 17:01:06 -07:00 |
|
Greg Hysen
|
fa7570352c
|
Added require reasons to MixinMatchOrders and cleaned up some comments.
|
2018-05-18 17:01:06 -07:00 |
|
Greg Hysen
|
f378406d15
|
Updated remaining contracts to v0.4.23
|
2018-05-18 17:01:05 -07:00 |
|
Greg Hysen
|
68fa7ae2a3
|
Removed isRoundingError from mixin header
|
2018-05-18 17:01:05 -07:00 |
|
Greg Hysen
|
9b1015bbce
|
Atomic Order Matching - Tests
|
2018-05-18 17:01:05 -07:00 |
|
Greg Hysen
|
a4c821eb60
|
Atomic Order Matching - Smart Contracts.
|
2018-05-18 17:01:05 -07:00 |
|
Brandon Millman
|
c70540e7f4
|
Merge pull request #598 from 0xProject/feature/website/mobile-optimize
Mobile optimize the portal layout
|
2018-05-18 15:38:04 -07:00 |
|
Brandon Millman
|
e291146443
|
Prettier
|
2018-05-18 11:36:17 -07:00 |
|
Brandon Millman
|
faa2b6237f
|
Change number of columns in relayer index for small screens
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
26661f3091
|
Wallet instead of balances for small screens
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
e6e8d49d72
|
Close drawer when new path is chosen
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
b9ca055586
|
Fix styling of portal menu
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
9ce7be050a
|
Refactor portal specific colors out of react-shared
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
1d2617c826
|
Add custom styling for drawer
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
7c8e9ddc42
|
Fix key issue for portal routes
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
157764c0d9
|
Fix responsiveness broken in rebase
|
2018-05-18 11:35:13 -07:00 |
|
Brandon Millman
|
317ff81744
|
Set up scaffolding for new drawer
|
2018-05-18 11:35:13 -07:00 |
|