Merge pull request #413 from 0xProject/feature/ethers-contracts

abi-gen V2 abi and ethers-contracts

2 files changed, 6 insertions, 3 deletions

diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts
index ba156ac20..c976e8f97 100644
--- a/packages/deployer/src/cli.ts
+++ b/packages/deployer/src/cli.ts
@@ -10,8 +10,8 @@ import { constants } from './utils/constants';
 import { CliOptions, CompilerOptions, DeployerOptions } from './utils/types';
 
 const DEFAULT_OPTIMIZER_ENABLED = false;
-const DEFAULT_CONTRACTS_DIR = path.resolve('src');
-const DEFAULT_ARTIFACTS_DIR = path.resolve('artifacts');
+const DEFAULT_CONTRACTS_DIR = path.resolve('src/contracts');
+const DEFAULT_ARTIFACTS_DIR = path.resolve('src/artifacts');
 const DEFAULT_NETWORK_ID = 50;
 const DEFAULT_JSONRPC_PORT = 8545;
 const DEFAULT_GAS_PRICE = (10 ** 9 * 2).toString();
@@ -100,6 +100,9 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
  */
 function getContractsSetFromList(contracts: string): Set<string> {
     const specifiedContracts = new Set();
+    if (contracts === '*') {
+        return new Set(['*']);
+    }
     const contractsArray = contracts.split(',');
     _.forEach(contractsArray, contractName => {
         const fileName = `${contractName}${constants.SOLIDITY_FILE_EXTENSION}`;
diff --git a/packages/deployer/src/deployer.ts b/packages/deployer/src/deployer.ts
index 021645fd1..6710bcc85 100644
--- a/packages/deployer/src/deployer.ts
+++ b/packages/deployer/src/deployer.ts
@@ -174,7 +174,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;