diff --git a/contracts/exchange-libs/contracts/src/LibOrder.sol b/contracts/exchange-libs/contracts/src/LibOrder.sol index d7172e4f99..f70eac5977 100644 --- a/contracts/exchange-libs/contracts/src/LibOrder.sol +++ b/contracts/exchange-libs/contracts/src/LibOrder.sol @@ -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 { diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts index 7b5099c498..ce7e6d85f7 100644 --- a/packages/order-utils/src/order_hash.ts +++ b/packages/order-utils/src/order_hash.ts @@ -65,7 +65,6 @@ export const orderHashUtils = { throw error; } const typedData = eip712Utils.createOrderTypedData(order); - console.log((typedData.types as any).Order); const orderHashBuff = signTypedDataUtils.generateTypedDataHash(typedData); return orderHashBuff; }, diff --git a/packages/order-utils/test/order_hash_test.ts b/packages/order-utils/test/order_hash_test.ts index 91508f4c0a..30376bf94d 100644 --- a/packages/order-utils/test/order_hash_test.ts +++ b/packages/order-utils/test/order_hash_test.ts @@ -14,7 +14,7 @@ const expect = chai.expect; describe('Order hashing', () => { describe('#getOrderHashHex', () => { - const expectedOrderHash = '0x43ecca3599d6c97564169d882b03b9ee2cbbb44f4b1fd0ed224a1e753e6d96b0'; + const expectedOrderHash = '0xf64c4b90214e8bd27a7830356a276c45b88fe18e0960fbe5b480167abb23b944'; const fakeExchangeContractAddress = '0x1dc4c1cefef38a777b15aa20260a54e584b16c48'; const fakeChainID = 50; const order: Order = {