diff options
author | Fabio Berger <me@fabioberger.com> | 2018-07-24 23:13:21 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-07-24 23:13:21 +0800 |
commit | 56f21f4bab2fd844961eb3f8366a421660d04706 (patch) | |
tree | 287b86096263641b9d0c3e7441dfdeb85e1ebb93 /packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol | |
parent | 9a36e73f4ed62871b2c39d129de0ac2c04aeba2b (diff) | |
parent | a05b14e4d9659be1cc495ee33fd8962ce773f87f (diff) | |
download | dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar.gz dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar.bz2 dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar.lz dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar.xz dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.tar.zst dexon-0x-contracts-56f21f4bab2fd844961eb3f8366a421660d04706.zip |
Merge v2-prototype
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol index 68f2c8aed..4031ff26b 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol @@ -103,20 +103,20 @@ contract LibOrder is bytes32 takerAssetDataHash = keccak256(order.takerAssetData); // Assembly for more efficiently computing: - // keccak256(abi.encode( - // order.makerAddress, - // order.takerAddress, - // order.feeRecipientAddress, - // order.senderAddress, - // order.makerAssetAmount, - // order.takerAssetAmount, - // order.makerFee, - // order.takerFee, - // order.expirationTimeSeconds, - // order.salt, - // keccak256(order.makerAssetData), - // keccak256(order.takerAssetData) - // )); + // keccak256(abi.encode( + // order.makerAddress, + // order.takerAddress, + // order.feeRecipientAddress, + // order.senderAddress, + // order.makerAssetAmount, + // order.takerAssetAmount, + // order.makerFee, + // order.takerFee, + // order.expirationTimeSeconds, + // order.salt, + // keccak256(order.makerAssetData), + // keccak256(order.takerAssetData) + // )); assembly { // Backup |