diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-29 06:41:06 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-29 06:41:06 +0800 |
| commit | 46d79e5115421285faa709e16ba6156f2c672f38 (patch) | |
| tree | eff87fc8f732b60c9294d34d4c12b071d5be4ea9 | |
| parent | 94740155e599d6314eb8c41d7b30c0e261e13602 (diff) | |
| download | dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar.gz dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar.bz2 dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar.lz dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar.xz dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.tar.zst dexon-sol-tools-46d79e5115421285faa709e16ba6156f2c672f38.zip | |
Updated hashing comments as-per PR
| -rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/libs/LibOrder.sol | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/libs/LibOrder.sol b/packages/contracts/src/contracts/current/protocol/Exchange/libs/LibOrder.sol index d1e5da580..954f94f76 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/libs/LibOrder.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/libs/LibOrder.sol @@ -99,11 +99,7 @@ contract LibOrder is bytes32 makerAssetDataHash = keccak256(order.makerAssetData); bytes32 takerAssetDataHash = keccak256(order.takerAssetData); // Assembly for more efficiently computing: - // keccak256(abi.encodePacked( - // DOMAIN_SEPARATOR_SCHEMA_HASH, - // keccak256(abi.encodePacked(address(this))), - // ORDER_SCHEMA_HASH, - // keccak256(abi.encodePacked( + // keccak256(abi.encode( // order.makerAddress, // order.takerAddress, // order.feeRecipientAddress, @@ -114,10 +110,9 @@ contract LibOrder is // order.takerFee, // order.expirationTimeSeconds, // order.salt, - // keccak256(abi.encodePacked(order.makerAssetData)), - // keccak256(abi.encodePacked(order.takerAssetData)) - // )) - // )); + // keccak256(order.makerAssetData), + // keccak256(order.takerAssetData) + // )); assembly { // Backup let temp1 := mload(sub(order, 32)) |