From 3e659f0de8ee22380fad40dd70dd5d35ecb92739 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 5 Mar 2018 11:40:33 -0800
Subject: Revert getOrderHash to old logic

---
 .../contracts/current/protocol/Exchange/LibOrder.sol   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'packages/contracts')

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol b/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol
index b548479cd..f0cd8f4fa 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol
@@ -36,8 +36,9 @@ contract LibOrder {
         "uint256 salt"
     );
     
+    //  TODO: Append `Address` to all address fields and `Amount` to all value fields?
     struct Order {
-        address exchange;
+        address exchange;   //  TODO: Does this need to be a part of the Order struct?
         address maker;
         address taker;
         address makerToken;
@@ -61,7 +62,20 @@ contract LibOrder {
         // TODO: EIP712 is not finalized yet
         orderHash = keccak256(
             orderSchemaHash,
-            keccak256(order)
+            keccak256(
+                order.exchange,
+                order.maker,
+                order.taker,
+                order.makerToken,
+                order.takerToken,
+                order.feeRecipient,
+                order.makerTokenAmount,
+                order.takerTokenAmount,
+                order.makerFee,
+                order.takerFee,
+                order.expirationTimestampInSec,
+                order.salt
+            )
         );
         return orderHash;
     }
-- 
cgit