From f1b267cc9fe7f6e5566dc2535b064b92aef92df1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 6 Dec 2017 20:55:09 +0300
Subject: Refactor web3Wrapper to a separate package

---
 packages/contracts/deploy/cli.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'packages/contracts/deploy/cli.ts')

diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index 73a43b247..df3ae33b4 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -1,3 +1,5 @@
+import {TxData} from '@0xproject/types';
+import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as yargs from 'yargs';
@@ -46,10 +48,10 @@ async function onMigrateCommand(argv: CliOptions): Promise<void> {
     await commands.compileAsync(compilerOpts);
 
     const defaults = {
-        gasPrice: argv.gasPrice,
+        gasPrice: new BigNumber(argv.gasPrice),
         from: argv.account,
     };
-    const deployerOpts: DeployerOptions = {
+    const deployerOpts = {
         artifactsDir: argv.artifactsDir,
         jsonrpcPort: argv.jsonrpcPort,
         networkId: networkIdIfExists,
@@ -72,7 +74,7 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
     await commands.compileAsync(compilerOpts);
 
     const defaults = {
-        gasPrice: argv.gasPrice,
+        gasPrice: new BigNumber(argv.gasPrice),
         from: argv.account,
     };
     const deployerOpts: DeployerOptions = {
-- 
cgit v1.2.3


From 825402b0f91ce266b310aed78e4fa73ae1359d36 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 7 Dec 2017 01:15:15 +0300
Subject: Address feedback

---
 packages/contracts/deploy/cli.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/contracts/deploy/cli.ts')

diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index df3ae33b4..0fdf85a9f 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -1,4 +1,3 @@
-import {TxData} from '@0xproject/types';
 import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
 import * as path from 'path';
-- 
cgit v1.2.3


From e0d79bd332a3f8a9cad5147f33b2bfaf49e6a5c7 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 8 Dec 2017 18:47:50 +0300
Subject: Inline network module

---
 packages/contracts/deploy/cli.ts | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'packages/contracts/deploy/cli.ts')

diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index 0fdf85a9f..423523e21 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -1,10 +1,11 @@
+import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
 import * as path from 'path';
+import * as Web3 from 'web3';
 import * as yargs from 'yargs';
 
 import {commands} from './src/commands';
-import {network} from './src/utils/network';
 import {
     CliOptions,
     CompilerOptions,
@@ -37,10 +38,13 @@ async function onCompileCommand(args: CliOptions): Promise<void> {
  * @param argv Instance of process.argv provided by yargs.
  */
 async function onMigrateCommand(argv: CliOptions): Promise<void> {
-    const networkIdIfExists = await network.getNetworkIdIfExistsAsync(argv.jsonrpcPort);
+    const url = `http://localhost:${argv.jsonrpcPort}`;
+    const web3Provider = new Web3.providers.HttpProvider(url);
+    const web3Wrapper = new Web3Wrapper(web3Provider);
+    const networkId = await web3Wrapper.getNetworkIdAsync();
     const compilerOpts: CompilerOptions = {
         contractsDir: argv.contractsDir,
-        networkId: networkIdIfExists,
+        networkId,
         optimizerEnabled: argv.shouldOptimize ? 1 : 0,
         artifactsDir: argv.artifactsDir,
     };
@@ -53,7 +57,7 @@ async function onMigrateCommand(argv: CliOptions): Promise<void> {
     const deployerOpts = {
         artifactsDir: argv.artifactsDir,
         jsonrpcPort: argv.jsonrpcPort,
-        networkId: networkIdIfExists,
+        networkId,
         defaults,
     };
     await commands.migrateAsync(deployerOpts);
@@ -63,10 +67,13 @@ async function onMigrateCommand(argv: CliOptions): Promise<void> {
  * @param argv Instance of process.argv provided by yargs.
  */
 async function onDeployCommand(argv: CliOptions): Promise<void> {
-    const networkIdIfExists = await network.getNetworkIdIfExistsAsync(argv.jsonrpcPort);
+    const url = `http://localhost:${argv.jsonrpcPort}`;
+    const web3Provider = new Web3.providers.HttpProvider(url);
+    const web3Wrapper = new Web3Wrapper(web3Provider);
+    const networkId = await web3Wrapper.getNetworkIdAsync();
     const compilerOpts: CompilerOptions = {
         contractsDir: argv.contractsDir,
-        networkId: networkIdIfExists,
+        networkId,
         optimizerEnabled: argv.shouldOptimize ? 1 : 0,
         artifactsDir: argv.artifactsDir,
     };
@@ -79,7 +86,7 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
     const deployerOpts: DeployerOptions = {
         artifactsDir: argv.artifactsDir,
         jsonrpcPort: argv.jsonrpcPort,
-        networkId: networkIdIfExists,
+        networkId,
         defaults,
     };
     const deployerArgsString = argv.args;
-- 
cgit v1.2.3