Update 0x.js version, fix build errors

6 files changed, 25 insertions, 10 deletions

diff --git a/packages/contracts/test/ts/erc20Token.ts b/packages/contracts/test/ts/erc20Token.ts
index 9aa93180b..1edcfcbbd 100644
--- a/packages/contracts/test/ts/erc20Token.ts
+++ b/packages/contracts/test/ts/erc20Token.ts
@@ -15,7 +15,10 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('ERC20Token', (accounts: string[]) => {
-    const zeroEx = new ZeroEx(web3.currentProvider);
+    const config = {
+        networkId: constants.TESTRPC_NETWORK_ID,
+    };
+    const zeroEx = new ZeroEx(web3.currentProvider, config);
     const owner = accounts[0];
     const spender = accounts[1];
 
diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index dbb4d2ee6..79c618ec2 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -5,6 +5,7 @@ import * as chai from 'chai';
 import Web3 = require('web3');
 
 import {Artifacts} from '../../util/artifacts';
+import {constants} from '../../util/constants';
 
 import {chaiSetup} from './utils/chai_setup';
 
@@ -22,11 +23,13 @@ contract('EtherToken', (accounts: string[]) => {
     const gasPrice = ZeroEx.toBaseUnitAmount(new BigNumber(20), 9);
     let zeroEx: ZeroEx;
     let etherTokenAddress: string;
+
     before(async () => {
         etherTokenAddress = EtherToken.address;
         zeroEx = new ZeroEx(web3.currentProvider, {
-                gasPrice,
-                etherTokenContractAddress: etherTokenAddress,
+            gasPrice,
+            etherTokenContractAddress: etherTokenAddress,
+            networkId: constants.TESTRPC_NETWORK_ID,
         });
     });
 
diff --git a/packages/contracts/test/ts/ether_token_v2.ts b/packages/contracts/test/ts/ether_token_v2.ts
index 0c352b522..4931eb798 100644
--- a/packages/contracts/test/ts/ether_token_v2.ts
+++ b/packages/contracts/test/ts/ether_token_v2.ts
@@ -5,6 +5,7 @@ import promisify = require('es6-promisify');
 import Web3 = require('web3');
 
 import {Artifacts} from '../../util/artifacts';
+import {constants} from '../../util/constants';
 
 import {chaiSetup} from './utils/chai_setup';
 
@@ -26,8 +27,9 @@ contract('EtherTokenV2', (accounts: string[]) => {
         const etherToken = await EtherTokenV2.new();
         etherTokenAddress = etherToken.address;
         zeroEx = new ZeroEx(web3.currentProvider, {
-                gasPrice,
-                etherTokenContractAddress: etherTokenAddress,
+            gasPrice,
+            etherTokenContractAddress: etherTokenAddress,
+            networkId: constants.TESTRPC_NETWORK_ID,
         });
     });
 
@@ -76,7 +78,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const expectedFrom = ZeroEx.NULL_ADDRESS;
             const expectedTo = account;
             const expectedValue = ethToDeposit;
-            const logArgs = logs[0].args;
+            const logArgs = (logs[0] as any).args;
             expect(logArgs._from).to.equal(expectedFrom);
             expect(logArgs._to).to.equal(expectedTo);
             expect(logArgs._value).to.be.bignumber.equal(ethToDeposit);
@@ -128,7 +130,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const expectedFrom = account;
             const expectedTo = ZeroEx.NULL_ADDRESS;
             const expectedValue = ethTokensToWithdraw;
-            const logArgs = logs[0].args;
+            const logArgs = (logs[0] as any).args;
             expect(logArgs._from).to.equal(expectedFrom);
             expect(logArgs._to).to.equal(expectedTo);
             expect(logArgs._value).to.be.bignumber.equal(ethTokensToWithdraw);
diff --git a/packages/contracts/test/ts/exchange/core.ts b/packages/contracts/test/ts/exchange/core.ts
index 7f632c6e6..641084937 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -59,6 +59,7 @@ contract('Exchange', (accounts: string[]) => {
         exWrapper = new ExchangeWrapper(exchange);
         zeroEx = new ZeroEx(web3.currentProvider, {
             exchangeContractAddress: exchange.address,
+            networkId: constants.TESTRPC_NETWORK_ID,
         });
 
         const [repAddress, dgdAddress, zrxAddress] = await Promise.all([
diff --git a/packages/contracts/test/ts/unlimitedAllowanceToken.ts b/packages/contracts/test/ts/unlimitedAllowanceToken.ts
index ca3fcd7d2..3b4d2db77 100644
--- a/packages/contracts/test/ts/unlimitedAllowanceToken.ts
+++ b/packages/contracts/test/ts/unlimitedAllowanceToken.ts
@@ -4,6 +4,7 @@ import * as chai from 'chai';
 import * as Web3 from 'web3';
 
 import {Artifacts} from '../../util/artifacts';
+import {constants} from '../../util/constants';
 import {ContractInstance} from '../../util/types';
 
 import {chaiSetup} from './utils/chai_setup';
@@ -14,7 +15,10 @@ chaiSetup.configure();
 const expect = chai.expect;
 
 contract('UnlimitedAllowanceToken', (accounts: string[]) => {
-    const zeroEx = new ZeroEx(web3.currentProvider);
+    const config = {
+        networkId: constants.TESTRPC_NETWORK_ID,
+    };
+    const zeroEx = new ZeroEx(web3.currentProvider, config);
     const owner = accounts[0];
     const spender = accounts[1];
 
diff --git a/packages/contracts/test/ts/zrxToken.ts b/packages/contracts/test/ts/zrxToken.ts
index 471ee93f2..1c9655402 100644
--- a/packages/contracts/test/ts/zrxToken.ts
+++ b/packages/contracts/test/ts/zrxToken.ts
@@ -4,6 +4,7 @@ import * as chai from 'chai';
 import Web3 = require('web3');
 
 import {Artifacts} from '../../util/artifacts';
+import {constants} from '../../util/constants';
 import {ContractInstance} from '../../util/types';
 
 import {chaiSetup} from './utils/chai_setup';
@@ -25,9 +26,10 @@ contract('ZRXToken', (accounts: string[]) => {
 
     beforeEach(async () => {
         zeroEx = new ZeroEx(web3.currentProvider, {
-                exchangeContractAddress: Exchange.address,
+            exchangeContractAddress: Exchange.address,
+            networkId: constants.TESTRPC_NETWORK_ID,
         });
-        zrxAddress = await zeroEx.exchange.getZRXTokenAddressAsync();
+        zrxAddress = zeroEx.exchange.getZRXTokenAddress();
         zrx = await ZRXToken.at(zrxAddress);
         MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     });