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
Show Stats 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. 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 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 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 // solhint-enable max-line-length
@ -118,7 +120,9 @@ contract LibOrder is
// order.expirationTimeSeconds, // order.expirationTimeSeconds,
// order.salt, // order.salt,
// keccak256(order.makerAssetData), // keccak256(order.makerAssetData),
// keccak256(order.takerAssetData) // keccak256(order.takerAssetData),
// keccak256(order.makerFeeAssetData),
// keccak256(order.takerFeeAssetData)
// )); // ));
assembly { assembly {

1
packages/order-utils/src/order_hash.ts
View File

@ -65,7 +65,6 @@ export const orderHashUtils = {
throw error; throw error;
} }
const typedData = eip712Utils.createOrderTypedData(order); const typedData = eip712Utils.createOrderTypedData(order);
console.log((typedData.types as any).Order);
const orderHashBuff = signTypedDataUtils.generateTypedDataHash(typedData); const orderHashBuff = signTypedDataUtils.generateTypedDataHash(typedData);
return orderHashBuff; return orderHashBuff;
}, },

2
packages/order-utils/test/order_hash_test.ts
View File

@ -14,7 +14,7 @@ const expect = chai.expect;
describe('Order hashing', () => { describe('Order hashing', () => {
describe('#getOrderHashHex', () => { describe('#getOrderHashHex', () => {
const expectedOrderHash = '0x43ecca3599d6c97564169d882b03b9ee2cbbb44f4b1fd0ed224a1e753e6d96b0'; const expectedOrderHash = '0xf64c4b90214e8bd27a7830356a276c45b88fe18e0960fbe5b480167abb23b944';
const fakeExchangeContractAddress = '0x1dc4c1cefef38a777b15aa20260a54e584b16c48'; const fakeExchangeContractAddress = '0x1dc4c1cefef38a777b15aa20260a54e584b16c48';
const fakeChainID = 50; const fakeChainID = 50;
const order: Order = { const order: Order = {