diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 04:41:56 +0800 |
|---|---|---|
| committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 07:46:24 +0800 |
| commit | 29971f36cf5c0096dfd3b52c014c52b812a9e9ac (patch) | |
| tree | afb28e7740b9148d39ee00b2f1db9a5d89751ec1 /packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol | |
| parent | 3e4493b389334fa28ae0f0043e4dbda23f21adec (diff) | |
| download | dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar.gz dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar.bz2 dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar.lz dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar.xz dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.tar.zst dexon-sol-tools-29971f36cf5c0096dfd3b52c014c52b812a9e9ac.zip | |
Split into assertFillable and assertValidFill
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol index 4d0411a63..5a5b0376e 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol @@ -61,8 +61,20 @@ contract MixinMatchOrders is // Fetch taker address address takerAddress = getCurrentContextAddress(); - + // Either our context is valid or we revert + assertFillableOrder( + leftOrder, + leftOrderInfo, + takerAddress, + leftSignature + ); + assertFillableOrder( + righttOrder, + righttOrderInfo, + takerAddress, + leftSignature + ); assertValidMatch(leftOrder, rightOrder); // Compute proportional fill amounts @@ -76,8 +88,6 @@ contract MixinMatchOrders is // Validate fill contexts assertValidFill( leftOrder, - leftOrderInfo, - takerAddress, matchedFillResults.left.takerAssetFilledAmount, matchedFillResults.left.takerAssetFilledAmount, matchedFillResults.left.makerAssetFilledAmount, @@ -85,8 +95,6 @@ contract MixinMatchOrders is ); assertValidFill( rightOrder, - rightOrderInfo, - takerAddress, matchedFillResults.right.takerAssetFilledAmount, matchedFillResults.right.takerAssetFilledAmount, matchedFillResults.right.makerAssetFilledAmount, |