diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-06-08 03:45:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 03:45:18 +0800 |
commit | 41f005a676b69311099441b170b277e76d5ca25b (patch) | |
tree | 447ac22825b000074a9ded906466b60a656fa5ce /src/0x.js.ts | |
parent | 7460acbc0b01df35b21971405d582621150443d4 (diff) | |
parent | 834b28bfbe26e0331820d978b5be659b27423528 (diff) | |
download | dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar.gz dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar.bz2 dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar.lz dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar.xz dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.tar.zst dexon-sol-tools-41f005a676b69311099441b170b277e76d5ca25b.zip |
Merge branch 'master' into batchCancelAsync
Diffstat (limited to 'src/0x.js.ts')
-rw-r--r-- | src/0x.js.ts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts index 7b53b70ea..8f1178b2a 100644 --- a/src/0x.js.ts +++ b/src/0x.js.ts @@ -130,11 +130,12 @@ export class ZeroEx { * Computes the orderHash for a given order and returns it as a hex encoded string. */ public async getOrderHashHexAsync(order: Order|SignedOrder): Promise<string> { - assert.doesConformToSchema( - 'order', SchemaValidator.convertToJSONSchemaCompatibleObject(order as object), orderSchema); + assert.doesConformToSchema('order', SchemaValidator.convertToJSONSchemaCompatibleObject(order as object), + orderSchema); + const exchangeContractAddr = await this.getExchangeAddressAsync(); - const hashHex = utils.getOrderHashHex(order, exchangeContractAddr); - return hashHex; + const orderHashHex = utils.getOrderHashHex(order, exchangeContractAddr); + return orderHashHex; } /** * Signs an orderHash and returns it's elliptic curve signature |