aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol18
1 files changed, 16 insertions, 2 deletions
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;
}