aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/utils
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-04-12 01:21:37 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:17 +0800
commitbc7672652ecbb39c57955d47cb96a8b9d558ba70 (patch)
tree0c3b623a3c7453ffe6643b40f03f9582d30af22c /packages/contracts/src/utils
parentcc77f8489e5a176406d4871772fcbae58703bafc (diff)
downloaddexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.gz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.bz2
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.lz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.xz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.zst
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.zip
makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData
Diffstat (limited to 'packages/contracts/src/utils')
-rw-r--r--packages/contracts/src/utils/order_utils.ts12
-rw-r--r--packages/contracts/src/utils/types.ts8
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/contracts/src/utils/order_utils.ts b/packages/contracts/src/utils/order_utils.ts
index 8eb4da35a..052ae89d6 100644
--- a/packages/contracts/src/utils/order_utils.ts
+++ b/packages/contracts/src/utils/order_utils.ts
@@ -35,8 +35,8 @@ export const orderUtils = {
takerFee: signedOrder.takerFee,
expirationTimeSeconds: signedOrder.expirationTimeSeconds,
salt: signedOrder.salt,
- makerAssetProxyData: signedOrder.makerAssetProxyData,
- takerAssetProxyData: signedOrder.takerAssetProxyData,
+ makerAssetData: signedOrder.makerAssetData,
+ takerAssetData: signedOrder.takerAssetData,
};
return orderStruct;
},
@@ -54,8 +54,8 @@ export const orderUtils = {
'uint256 takerFee',
'uint256 expirationTimeSeconds',
'uint256 salt',
- 'bytes makerAssetProxyData',
- 'bytes takerAssetProxyData',
+ 'bytes makerAssetData',
+ 'bytes takerAssetData',
]);
const orderParamsHashBuff = crypto.solSHA3([
order.exchangeAddress,
@@ -70,8 +70,8 @@ export const orderUtils = {
order.takerFee,
order.expirationTimeSeconds,
order.salt,
- ethUtil.toBuffer(order.makerAssetProxyData),
- ethUtil.toBuffer(order.takerAssetProxyData),
+ ethUtil.toBuffer(order.makerAssetData),
+ ethUtil.toBuffer(order.takerAssetData),
]);
const orderSchemaHashHex = `0x${orderSchemaHashBuff.toString('hex')}`;
const orderParamsHashHex = `0x${orderParamsHashBuff.toString('hex')}`;
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index dc12e927a..8cfde8a07 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -54,8 +54,8 @@ export interface DefaultOrderParams {
takerTokenAmount: BigNumber;
makerFeeAmount: BigNumber;
takerFeeAmount: BigNumber;
- makerAssetProxyData: string;
- takerAssetProxyData: string;
+ makerAssetData: string;
+ takerAssetData: string;
}
export interface TransactionDataParams {
@@ -148,8 +148,8 @@ export interface OrderStruct {
takerFee: BigNumber;
expirationTimeSeconds: BigNumber;
salt: BigNumber;
- makerAssetProxyData: string;
- takerAssetProxyData: string;
+ makerAssetData: string;
+ takerAssetData: string;
}
export interface UnsignedOrder extends OrderStruct {