aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-06-08 22:46:58 +0800
committerGitHub <noreply@github.com>2017-06-08 22:46:58 +0800
commit3090a71e9df2c91ba44665c6b5098997669f72c3 (patch)
tree10c963e33189da758ec54640fb5ede0c9bff6867 /src
parent49d8b5b18b48604f852038662a0bb0ea598671e0 (diff)
parent2195bc61347d6d132b6ce23ec05186c4afa4dd46 (diff)
downloaddexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar.gz
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar.bz2
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar.lz
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar.xz
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.tar.zst
dexon-0x-contracts-3090a71e9df2c91ba44665c6b5098997669f72c3.zip
Merge branch 'master' into batchFillAsync
Diffstat (limited to 'src')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 5caa1da2d..2e1f887d8 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -408,6 +408,12 @@ export class ExchangeWrapper extends ContractWrapper {
const orderHashHex = utils.getOrderHashHex(order, exchangeInstance.address);
return orderHashHex;
}
+ private async getOrderHashHexUsingContractCallAsync(order: Order|SignedOrder): Promise<string> {
+ const exchangeInstance = await this.getExchangeContractAsync();
+ const [orderAddresses, orderValues] = ExchangeWrapper.getOrderAddressesAndValues(order);
+ const orderHashHex = await exchangeInstance.getOrderHash.call(orderAddresses, orderValues);
+ return orderHashHex;
+ }
private async stopWatchingExchangeLogEventsAsync() {
const stopWatchingPromises = _.map(this.exchangeLogEventObjs, logEventObj => {
return promisify(logEventObj.stopWatching, logEventObj)();