Merge branch 'development' into dev-tools-pages

5 files changed, 13 insertions, 10 deletions

diff --git a/packages/testnet-faucets/src/ts/dispatch_queue.ts b/packages/testnet-faucets/src/ts/dispatch_queue.ts
index 0a13df7c9..3d0958fbf 100644
--- a/packages/testnet-faucets/src/ts/dispatch_queue.ts
+++ b/packages/testnet-faucets/src/ts/dispatch_queue.ts
@@ -1,4 +1,4 @@
-import { intervalUtils, logUtils } from '@0xproject/utils';
+import { intervalUtils, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { errorReporter } from './error_reporter';
diff --git a/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts b/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
index fa63ab63e..32f5cb623 100644
--- a/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
+++ b/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
@@ -1,6 +1,6 @@
 import { ERC20TokenWrapper } from '0x.js';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 import { configs } from './configs';
diff --git a/packages/testnet-faucets/src/ts/error_reporter.ts b/packages/testnet-faucets/src/ts/error_reporter.ts
index 49c37b6eb..d5358aed0 100644
--- a/packages/testnet-faucets/src/ts/error_reporter.ts
+++ b/packages/testnet-faucets/src/ts/error_reporter.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import * as express from 'express';
 import rollbar = require('rollbar');
 
diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts
index be42ebde8..2dfa3c3af 100644
--- a/packages/testnet-faucets/src/ts/handler.ts
+++ b/packages/testnet-faucets/src/ts/handler.ts
@@ -11,9 +11,9 @@ import {
     SignedOrder,
     Web3ProviderEngine,
 } from '0x.js';
-import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0xproject/subproviders';
-import { logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0x/subproviders';
+import { logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as express from 'express';
 import * as _ from 'lodash';
 
@@ -65,7 +65,10 @@ export class Handler {
             const web3Wrapper = new Web3Wrapper(providerObj);
             // tslint:disable-next-line:custom-no-magic-numbers
             const networkId = parseInt(networkIdString, 10);
-            const contractWrappers = new ContractWrappers(providerObj, { networkId });
+            const contractWrappersConfig = {
+                networkId,
+            };
+            const contractWrappers = new ContractWrappers(providerObj, contractWrappersConfig);
             const dispatchQueue = new DispatchQueue();
             this._networkConfigByNetworkId[networkId] = {
                 dispatchQueue,
@@ -172,7 +175,7 @@ export class Handler {
             makerAssetData,
             takerAssetData,
             salt: generatePseudoRandomSalt(),
-            exchangeAddress: networkConfig.contractWrappers.exchange.getContractAddress(),
+            exchangeAddress: networkConfig.contractWrappers.exchange.address,
             feeRecipientAddress: NULL_ADDRESS,
             senderAddress: NULL_ADDRESS,
             // tslint:disable-next-line:custom-no-magic-numbers
diff --git a/packages/testnet-faucets/src/ts/parameter_transformer.ts b/packages/testnet-faucets/src/ts/parameter_transformer.ts
index 7320b1d1c..bed8eb99e 100644
--- a/packages/testnet-faucets/src/ts/parameter_transformer.ts
+++ b/packages/testnet-faucets/src/ts/parameter_transformer.ts
@@ -1,4 +1,4 @@
-import { addressUtils } from '@0xproject/utils';
+import { addressUtils } from '@0x/utils';
 import { NextFunction, Request, Response } from 'express';
 import * as _ from 'lodash';