7 files changed, 22 insertions, 153 deletions
diff --git a/packages/contracts/deploy/src/compiler.ts b/packages/contracts/deploy/src/compiler.ts
index 70b88b514..8a44e94a3 100644
--- a/packages/contracts/deploy/src/compiler.ts
+++ b/packages/contracts/deploy/src/compiler.ts
@@ -1,4 +1,4 @@
-import promisify = require('es6-promisify');
+import {promisify} from '@0xproject/utils';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 import * as path from 'path';
diff --git a/packages/contracts/deploy/src/deployer.ts b/packages/contracts/deploy/src/deployer.ts
index 48d175a42..2d4f31949 100644
--- a/packages/contracts/deploy/src/deployer.ts
+++ b/packages/contracts/deploy/src/deployer.ts
@@ -1,4 +1,6 @@
-import promisify = require('es6-promisify');
+import {TxData} from '@0xproject/types';
+import {promisify} from '@0xproject/utils';
+import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
@@ -11,7 +13,6 @@ import {
     DeployerOptions,
 } from './utils/types';
 import {utils} from './utils/utils';
-import {Web3Wrapper} from './utils/web3_wrapper';
 
 // Gas added to gas estimate to make sure there is sufficient gas for deployment.
 const EXTRA_GAS = 200000;
@@ -21,7 +22,7 @@ export class Deployer {
     private artifactsDir: string;
     private jsonrpcPort: number;
     private networkId: number;
-    private defaults: Partial<Web3.TxData>;
+    private defaults: Partial<TxData>;
 
     constructor(opts: DeployerOptions) {
         this.artifactsDir = opts.artifactsDir;
@@ -30,7 +31,7 @@ export class Deployer {
         const jsonrpcUrl = `http://localhost:${this.jsonrpcPort}`;
         const web3Provider = new Web3.providers.HttpProvider(jsonrpcUrl);
         this.defaults = opts.defaults;
-        this.web3Wrapper = new Web3Wrapper(web3Provider, this.defaults);
+        this.web3Wrapper = new Web3Wrapper(web3Provider, this.networkId, this.defaults);
     }
     /**
      * Loads contract artifact and deploys contract with given arguments.
@@ -171,7 +172,7 @@ export class Deployer {
         const block = await this.web3Wrapper.getBlockAsync('latest');
         let gas: number;
         try {
-            const gasEstimate: number = await this.web3Wrapper.estimateGasAsync({data});
+            const gasEstimate: number = await this.web3Wrapper.estimateGasAsync(data);
             gas = Math.min(gasEstimate + EXTRA_GAS, block.gasLimit);
         } catch (err) {
             gas = block.gasLimit;
diff --git a/packages/contracts/deploy/src/utils/contract.ts b/packages/contracts/deploy/src/utils/contract.ts
index e9c49c9f1..7b6098cea 100644
--- a/packages/contracts/deploy/src/utils/contract.ts
+++ b/packages/contracts/deploy/src/utils/contract.ts
@@ -1,5 +1,5 @@
 import {schemas, SchemaValidator} from '@0xproject/json-schemas';
-import promisify = require('es6-promisify');
+import {promisify} from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
diff --git a/packages/contracts/deploy/src/utils/fs_wrapper.ts b/packages/contracts/deploy/src/utils/fs_wrapper.ts
index 6b4fd625c..90785d0dd 100644
--- a/packages/contracts/deploy/src/utils/fs_wrapper.ts
+++ b/packages/contracts/deploy/src/utils/fs_wrapper.ts
@@ -1,11 +1,11 @@
-import promisify = require('es6-promisify');
+import {promisify} from '@0xproject/utils';
 import * as fs from 'fs';
 
 export const fsWrapper = {
-    readdirAsync: promisify(fs.readdir),
-    readFileAsync: promisify(fs.readFile),
-    writeFileAsync: promisify(fs.writeFile),
-    mkdirAsync: promisify(fs.mkdir),
+    readdirAsync: promisify<string[]>(fs.readdir),
+    readFileAsync: promisify<string>(fs.readFile),
+    writeFileAsync: promisify<undefined>(fs.writeFile),
+    mkdirAsync: promisify<undefined>(fs.mkdir),
     doesPathExistSync: fs.existsSync,
-    removeFileAsync: promisify(fs.unlink),
+    removeFileAsync: promisify<undefined>(fs.unlink),
 };
diff --git a/packages/contracts/deploy/src/utils/network.ts b/packages/contracts/deploy/src/utils/network.ts
index 74123e6a5..fcb78287c 100644
--- a/packages/contracts/deploy/src/utils/network.ts
+++ b/packages/contracts/deploy/src/utils/network.ts
@@ -1,15 +1,14 @@
-import promisify = require('es6-promisify');
+import {promisify} from '@0xproject/utils';
+import {Web3Wrapper} from '@0xproject/web3-wrapper';
+import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
-import {Web3Wrapper} from './web3_wrapper';
-
 export const network = {
     async getNetworkIdIfExistsAsync(port: number): Promise<number> {
         const url = `http://localhost:${port}`;
         const web3Provider = new Web3.providers.HttpProvider(url);
-        const defaults = {};
-        const web3Wrapper = new Web3Wrapper(web3Provider, defaults);
-        const networkIdIfExists = await web3Wrapper.getNetworkIdIfExistsAsync();
-        return networkIdIfExists;
+        const web3 = new Web3(web3Provider);
+        const networkId = _.parseInt(await promisify<string>(web3.version.getNetwork)());
+        return networkId;
     },
 };
diff --git a/packages/contracts/deploy/src/utils/types.ts b/packages/contracts/deploy/src/utils/types.ts
index 855f1e849..f6b9de6e9 100644
--- a/packages/contracts/deploy/src/utils/types.ts
+++ b/packages/contracts/deploy/src/utils/types.ts
@@ -1,3 +1,4 @@
+import {TxData} from '@0xproject/types';
 import * as Web3 from 'web3';
 
 export enum AbiType {
@@ -54,7 +55,7 @@ export interface DeployerOptions {
     artifactsDir: string;
     jsonrpcPort: number;
     networkId: number;
-    defaults: Partial<Web3.TxData>;
+    defaults: Partial<TxData>;
 }
 
 export interface ContractSources {
diff --git a/packages/contracts/deploy/src/utils/web3_wrapper.ts b/packages/contracts/deploy/src/utils/web3_wrapper.ts
deleted file mode 100644
index 0209da26d..000000000
--- a/packages/contracts/deploy/src/utils/web3_wrapper.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import BigNumber from 'bignumber.js';
-import promisify = require('es6-promisify');
-import * as _ from 'lodash';
-import * as Web3 from 'web3';
-
-import {Contract} from './contract';
-import {ZeroExError} from './types';
-
-export class Web3Wrapper {
-    private web3: Web3;
-    private defaults: Partial<Web3.TxData>;
-    private networkIdIfExists?: number;
-    private jsonRpcRequestId: number;
-    constructor(provider: Web3.Provider, defaults: Partial<Web3.TxData>) {
-        this.web3 = new Web3();
-        this.web3.setProvider(provider);
-        this.defaults = defaults;
-        this.jsonRpcRequestId = 0;
-    }
-    public setProvider(provider: Web3.Provider) {
-        delete this.networkIdIfExists;
-        this.web3.setProvider(provider);
-    }
-    public isAddress(address: string): boolean {
-        return this.web3.isAddress(address);
-    }
-    public getContractFromAbi(abi: Web3.ContractAbi): Web3.Contract<Web3.ContractInstance> {
-        const contract = this.web3.eth.contract(abi);
-        return contract;
-    }
-    public async isSenderAddressAvailableAsync(senderAddress: string): Promise<boolean> {
-        const addresses = await this.getAvailableAddressesAsync();
-        return _.includes(addresses, senderAddress);
-    }
-    public async getNodeVersionAsync(): Promise<string> {
-        const nodeVersion = await promisify(this.web3.version.getNode)();
-        return nodeVersion;
-    }
-    public async getTransactionReceiptAsync(txHash: string): Promise<Web3.TransactionReceipt> {
-        const transactionReceipt = await promisify(this.web3.eth.getTransactionReceipt)(txHash);
-        return transactionReceipt;
-    }
-    public getCurrentProvider(): Web3.Provider {
-        return this.web3.currentProvider;
-    }
-    public async getNetworkIdIfExistsAsync(): Promise<number|undefined> {
-        if (!_.isUndefined(this.networkIdIfExists)) {
-          return this.networkIdIfExists;
-        }
-
-        try {
-            const networkId = await this.getNetworkAsync();
-            this.networkIdIfExists = Number(networkId);
-            return this.networkIdIfExists;
-        } catch (err) {
-            return undefined;
-        }
-    }
-    public toWei(ethAmount: BigNumber): BigNumber {
-        const balanceWei = this.web3.toWei(ethAmount, 'ether');
-        return balanceWei;
-    }
-    public async getBalanceInWeiAsync(owner: string): Promise<BigNumber> {
-        let balanceInWei = await promisify(this.web3.eth.getBalance)(owner);
-        balanceInWei = new BigNumber(balanceInWei);
-        return balanceInWei;
-    }
-    public async doesContractExistAtAddressAsync(address: string): Promise<boolean> {
-        const code = await promisify(this.web3.eth.getCode)(address);
-        // Regex matches 0x0, 0x00, 0x in order to accommodate poorly implemented clients
-        const codeIsEmpty = /^0x0{0,40}$/i.test(code);
-        return !codeIsEmpty;
-    }
-    public async signTransactionAsync(address: string, message: string): Promise<string> {
-        const signData = await promisify(this.web3.eth.sign)(address, message);
-        return signData;
-    }
-    public async getBlockAsync(blockParam: string|Web3.BlockParam): Promise<Web3.BlockWithoutTransactionData> {
-        const block = await promisify(this.web3.eth.getBlock)(blockParam);
-        return block;
-    }
-    public async getBlockTimestampAsync(blockParam: string|Web3.BlockParam): Promise<number> {
-        const {timestamp} = await this.getBlockAsync(blockParam);
-        return timestamp;
-    }
-    public async getAvailableAddressesAsync(): Promise<string[]> {
-        const addresses: string[] = await promisify(this.web3.eth.getAccounts)();
-        return addresses;
-    }
-    public async getLogsAsync(filter: Web3.FilterObject): Promise<Web3.LogEntry[]> {
-        let fromBlock = filter.fromBlock;
-        if (_.isNumber(fromBlock)) {
-            fromBlock = this.web3.toHex(fromBlock);
-        }
-        let toBlock = filter.toBlock;
-        if (_.isNumber(toBlock)) {
-            toBlock = this.web3.toHex(toBlock);
-        }
-        const serializedFilter = {
-            ...filter,
-            fromBlock,
-            toBlock,
-        };
-        const payload = {
-            jsonrpc: '2.0',
-            id: this.jsonRpcRequestId++,
-            method: 'eth_getLogs',
-            params: [serializedFilter],
-        };
-        const logs = await this.sendRawPayloadAsync(payload);
-        return logs;
-    }
-    public async estimateGasAsync(callData: Web3.CallData): Promise<number> {
-        const gasEstimate = await promisify(this.web3.eth.estimateGas)(callData);
-        return gasEstimate;
-    }
-    private getContractInstance<A extends Web3.ContractInstance>(abi: Web3.ContractAbi, address: string): A {
-        const web3ContractInstance = this.web3.eth.contract(abi).at(address);
-        const contractInstance = new Contract(web3ContractInstance, this.defaults) as any as A;
-        return contractInstance;
-    }
-    private async getNetworkAsync(): Promise<number> {
-        const networkId = await promisify(this.web3.version.getNetwork)();
-        return networkId;
-    }
-    private async sendRawPayloadAsync(payload: Web3.JSONRPCRequestPayload): Promise<any> {
-        const sendAsync = this.web3.currentProvider.sendAsync.bind(this.web3.currentProvider);
-        const response = await promisify(sendAsync)(payload);
-        const result = response.result;
-        return result;
-    }
-}