aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2019-02-02 08:28:29 +0800
committerAmir Bandeali <abandeali1@gmail.com>2019-02-06 01:23:09 +0800
commita394967268be3f3d3f7da3507887ee88befee253 (patch)
treeb05b92cdea012c616cb31462f0d238c94ebe21f5 /packages
parentc7c4cb9bc6824f12adf352253464c76f177b4914 (diff)
downloaddexon-0x-contracts-a394967268be3f3d3f7da3507887ee88befee253.tar.gz
dexon-0x-contracts-a394967268be3f3d3f7da3507887ee88befee253.tar.zst
dexon-0x-contracts-a394967268be3f3d3f7da3507887ee88befee253.zip
Use new transaction schema throughout monorepo
Diffstat (limited to 'packages')
-rw-r--r--packages/contract-wrappers/src/utils/transaction_encoder.ts3
-rw-r--r--packages/order-utils/test/transaction_hash_test.ts2
2 files changed, 3 insertions, 2 deletions
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';