From d92fd437911a5b9c0af15322e39dd4c2a1f4ab60 Mon Sep 17 00:00:00 2001
From: Remco Bloemen <remco@wicked.ventures>
Date: Fri, 17 Aug 2018 12:12:27 -0700
Subject: Update for new assertValidFill signature

---
 .../contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol  | 9 +++++----
 .../contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol   | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'packages/contracts/src')

diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
index e6b2ddf3d..36060a1b6 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
@@ -98,6 +98,9 @@ contract MixinExchangeCore is
         uint256 remainingTakerAssetAmount = safeSub(order.takerAssetAmount, orderInfo.orderTakerAssetFilledAmount);
         uint256 takerAssetFilledAmount = min256(takerAssetFillAmount, remainingTakerAssetAmount);
 
+        // Compute proportional fill amounts
+        fillResults = calculateFillResults(order, takerAssetFilledAmount);
+        
         // Validate context
         assertValidFill(
             order,
@@ -105,12 +108,10 @@ contract MixinExchangeCore is
             takerAddress,
             takerAssetFillAmount,
             takerAssetFilledAmount,
+            fillResults.makerAssetFilledAmount,
             signature
         );
-
-        // Compute proportional fill amounts
-        fillResults = calculateFillResults(order, takerAssetFilledAmount);
-
+        
         // Update exchange internal state
         updateFilledState(
             order,
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 56b309a1b..4d0411a63 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
@@ -80,6 +80,7 @@ contract MixinMatchOrders is
             takerAddress,
             matchedFillResults.left.takerAssetFilledAmount,
             matchedFillResults.left.takerAssetFilledAmount,
+            matchedFillResults.left.makerAssetFilledAmount,
             leftSignature
         );
         assertValidFill(
@@ -88,9 +89,10 @@ contract MixinMatchOrders is
             takerAddress,
             matchedFillResults.right.takerAssetFilledAmount,
             matchedFillResults.right.takerAssetFilledAmount,
+            matchedFillResults.right.makerAssetFilledAmount,
             rightSignature
         );
-
+        
         // Update exchange state
         updateFilledState(
             leftOrder,
-- 
cgit