aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/deploy/cli.ts21
-rw-r--r--packages/contracts/deploy/src/utils/network.ts14
2 files changed, 14 insertions, 21 deletions
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;
diff --git a/packages/contracts/deploy/src/utils/network.ts b/packages/contracts/deploy/src/utils/network.ts
deleted file mode 100644
index f9776bb97..000000000
--- a/packages/contracts/deploy/src/utils/network.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {promisify} from '@0xproject/utils';
-import {Web3Wrapper} from '@0xproject/web3-wrapper';
-import * as _ from 'lodash';
-import * as Web3 from 'web3';
-
-export const network = {
- async getNetworkIdIfExistsAsync(port: number): Promise<number> {
- const url = `http://localhost:${port}`;
- const web3Provider = new Web3.providers.HttpProvider(url);
- const web3Wrapper = new Web3Wrapper(web3Provider);
- const networkId = web3Wrapper.getNetworkIdAsync();
- return networkId;
- },
-};