From a394967268be3f3d3f7da3507887ee88befee253 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 1 Feb 2019 16:28:29 -0800 Subject: Use new transaction schema throughout monorepo --- packages/contract-wrappers/src/utils/transaction_encoder.ts | 3 ++- packages/order-utils/test/transaction_hash_test.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts index 0cf08a8fe..c674abbe5 100644 --- a/packages/contract-wrappers/src/utils/transaction_encoder.ts +++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts @@ -28,11 +28,12 @@ export class TransactionEncoder { public getTransactionHex(data: string, salt: BigNumber, signerAddress: string): string { const exchangeAddress = this._getExchangeContract().address; const executeTransactionData = { + verifyingContractAddress: exchangeAddress, salt, signerAddress, data, }; - const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, exchangeAddress); + const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData); const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData); const messageHex = `0x${eip712MessageBuffer.toString('hex')}`; return messageHex; diff --git a/packages/order-utils/test/transaction_hash_test.ts b/packages/order-utils/test/transaction_hash_test.ts index 0c371c7c2..c7ca33a64 100644 --- a/packages/order-utils/test/transaction_hash_test.ts +++ b/packages/order-utils/test/transaction_hash_test.ts @@ -12,7 +12,7 @@ import { chaiSetup } from './utils/chai_setup'; chaiSetup.configure(); const expect = chai.expect; -describe.only('0x transaction hashing', () => { +describe('0x transaction hashing', () => { describe('#getTransactionHashHex', () => { const expectedTransactionHash = '0x82c9bb2dcac4f868ec7a15c20ff6175cfc384c20ae6a872aa0342a840f108c2b'; const fakeVerifyingContractAddress = '0x5e72914535f202659083db3a02c984188fa26e9f'; -- cgit v1.2.3