diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-08 17:31:40 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-08 17:31:40 +0800 |
commit | c1322717802d652090fb374ac706cb1abf6c26be (patch) | |
tree | efc3905da0882f1e23b896f06a59e48122bd3532 /src/0x.js.ts | |
parent | 5d464d87e07003c231fca55e87b95cc7e1e9e978 (diff) | |
parent | c6645f9f4f470323086d9004cf603a68091d71a3 (diff) | |
download | dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.gz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.bz2 dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.lz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.xz dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.tar.zst dexon-sol-tools-c1322717802d652090fb374ac706cb1abf6c26be.zip |
Merge branch 'master' into batchFillAsync
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 |