aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-wrappers/src/utils
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-08-22 20:12:42 +0800
committerFabio Berger <me@fabioberger.com>2018-08-22 20:12:42 +0800
commitd907b403788576c7d4fe51090a561f1e951126e2 (patch)
tree52476a8603aba176cf1afb9bb16fbc5c40daea6b /packages/contract-wrappers/src/utils
parent0248add542ac801bcb021fa7b13c182baec5612e (diff)
downloaddexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.gz
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.bz2
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.lz
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.xz
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.tar.zst
dexon-sol-tools-d907b403788576c7d4fe51090a561f1e951126e2.zip
Fix remaining merge issues
Diffstat (limited to 'packages/contract-wrappers/src/utils')
-rw-r--r--packages/contract-wrappers/src/utils/transaction_encoder.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts
index 5c2a94b74..8821079dc 100644
--- a/packages/contract-wrappers/src/utils/transaction_encoder.ts
+++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts
@@ -1,5 +1,5 @@
import { schemas } from '@0xproject/json-schemas';
-import { EIP712Schema, EIP712Types, EIP712Utils } from '@0xproject/order-utils';
+import { EIP712Schema, EIP712Types, eip712Utils } from '@0xproject/order-utils';
import { Order, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import _ = require('lodash');
@@ -41,11 +41,11 @@ export class TransactionEncoder {
signerAddress,
data,
};
- const executeTransactionHashBuff = EIP712Utils.structHash(
+ const executeTransactionHashBuff = eip712Utils.structHash(
EIP712_ZEROEX_TRANSACTION_SCHEMA,
executeTransactionData,
);
- const eip721MessageBuffer = EIP712Utils.createEIP712Message(executeTransactionHashBuff, exchangeAddress);
+ const eip721MessageBuffer = eip712Utils.createEIP712Message(executeTransactionHashBuff, exchangeAddress);
const messageHex = `0x${eip721MessageBuffer.toString('hex')}`;
return messageHex;
}