crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In @0x/order-utils: Fix order hash tests.

Browse Source 
In `@0x/contracts-exchange-libs`: Add fee asset datas to `LibOrder` type.
This commit is contained in:
Lawrence Forman
2019-05-08 10:43:55 -04:00
committed by Amir Bandeali
parent 64c596c922
commit 94d0db2dba
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/exchange-libs/contracts/src/LibOrder.sol
View File

@@ -69,6 +69,8 @@ contract LibOrder is
uint256 salt; // Arbitrary number to facilitate uniqueness of the order's hash.
bytes makerAssetData; // Encoded data that can be decoded by a specified proxy contract when transferring makerAsset. The last byte references the id of this proxy.
bytes takerAssetData; // Encoded data that can be decoded by a specified proxy contract when transferring takerAsset. The last byte references the id of this proxy.
bytes makerFeeAssetData; // Encoded data that can be decoded by a specified proxy contract when transferring makerAsset fees. The last byte references the id of this proxy.
bytes takerFeeAssetData; // Encoded data that can be decoded by a specified proxy contract when transferring takerAsset fees. The last byte references the id of this proxy.
}
// solhint-enable max-line-length
@@ -118,7 +120,9 @@ contract LibOrder is
// order.expirationTimeSeconds,
// order.salt,
// keccak256(order.makerAssetData),
// keccak256(order.takerAssetData)
// keccak256(order.takerAssetData),
// keccak256(order.makerFeeAssetData),
// keccak256(order.takerFeeAssetData)
// ));
assembly {