Merge pull request #82 from 0xProject/add-exchange-address-to-order-struct

Allow multiple Exchange contracts and multiple artifacts

3 files changed, 4 insertions, 3 deletions

diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index 94b119d5a..38c1d4aae 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -2,6 +2,7 @@ import * as _ from 'lodash';
 import * as BigNumber from 'bignumber.js';
 import * as Web3 from 'web3';
 import {Web3Wrapper} from '../web3_wrapper';
+import {Schema} from 'jsonschema';
 import {SchemaValidator} from './schema_validator';
 import {utils} from './utils';
 
diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts
index 9097dce88..e3f911adb 100644
--- a/src/utils/schema_validator.ts
+++ b/src/utils/schema_validator.ts
@@ -1,4 +1,4 @@
-import {Validator, ValidatorResult} from 'jsonschema';
+import {Validator, ValidatorResult,  Schema} from 'jsonschema';
 import {ecSignatureSchema, ecSignatureParameterSchema} from '../schemas/ec_signature_schema';
 import {orderSchema, signedOrderSchema} from '../schemas/order_schemas';
 import {addressSchema, numberSchema} from '../schemas/basic_type_schemas';
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 6f2d02a70..061e9f99a 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -32,9 +32,9 @@ export const utils = {
     spawnSwitchErr(name: string, value: any): Error {
         return new Error(`Unexpected switch value: ${value} encountered for ${name}`);
     },
-    getOrderHashHex(order: Order|SignedOrder, exchangeContractAddr: string): string {
+    getOrderHashHex(order: Order|SignedOrder): string {
         const orderParts = [
-            {value: exchangeContractAddr, type: SolidityTypes.address},
+            {value: order.exchangeContractAddress, type: SolidityTypes.address},
             {value: order.maker, type: SolidityTypes.address},
             {value: order.taker, type: SolidityTypes.address},
             {value: order.makerTokenAddress, type: SolidityTypes.address},