Merge pull request #273 from 0xProject/fix/contract-fixes

Add proper types for yargs and ethereumjs-abi

5 files changed, 17 insertions, 13 deletions

diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index a5c27b907..00943f063 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -38,7 +38,7 @@
     "@types/handlebars": "^4.0.36",
     "@types/mkdirp": "^0.5.1",
     "@types/node": "^8.0.53",
-    "@types/yargs": "^8.0.2",
+    "@types/yargs": "^10.0.0",
     "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index 423523e21..b02849826 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -23,12 +23,12 @@ const DEFAULT_GAS_PRICE = ((10 ** 9) * 2).toString();
  * Compiles all contracts with options passed in through CLI.
  * @param argv Instance of process.argv provided by yargs.
  */
-async function onCompileCommand(args: CliOptions): Promise<void> {
+async function onCompileCommand(argv: CliOptions): Promise<void> {
     const opts: CompilerOptions = {
-        contractsDir: args.contractsDir,
-        networkId: args.networkId,
-        optimizerEnabled: args.shouldOptimize ? 1 : 0,
-        artifactsDir: args.artifactsDir,
+        contractsDir: argv.contractsDir,
+        networkId: argv.networkId,
+        optimizerEnabled: argv.shouldOptimize ? 1 : 0,
+        artifactsDir: argv.artifactsDir,
     };
     await commands.compileAsync(opts);
 }
@@ -113,6 +113,7 @@ function deployCommandBuilder(yargsInstance: any) {
 }
 
 (() => {
+    const identityCommandBuilder = _.identity;
     return yargs
         .option('contracts-dir', {
             type: 'string',
@@ -150,11 +151,11 @@ function deployCommandBuilder(yargsInstance: any) {
         })
         .command('compile',
                  'compile contracts',
-                 _.noop,
+                 identityCommandBuilder,
                  onCompileCommand)
         .command('migrate',
                  'compile and deploy contracts using migration scripts',
-                 _.noop,
+                 identityCommandBuilder,
                  onMigrateCommand)
         .command('deploy',
                  'deploy a single contract with provided arguments',
diff --git a/packages/contracts/deploy/src/utils/types.ts b/packages/contracts/deploy/src/utils/types.ts
index f6b9de6e9..6831079e6 100644
--- a/packages/contracts/deploy/src/utils/types.ts
+++ b/packages/contracts/deploy/src/utils/types.ts
@@ -1,5 +1,6 @@
 import {TxData} from '@0xproject/types';
 import * as Web3 from 'web3';
+import * as yargs from 'yargs';
 
 export enum AbiType {
     Function = 'function',
@@ -32,7 +33,7 @@ export interface SolcErrors {
     [key: string]: boolean;
 }
 
-export interface CliOptions {
+export interface CliOptions extends yargs.Arguments {
     artifactsDir: string;
     contractsDir: string;
     jsonrpcPort: number;
diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts
index df53e9372..2e5827324 100644
--- a/packages/contracts/globals.d.ts
+++ b/packages/contracts/globals.d.ts
@@ -1,8 +1,5 @@
-declare module 'bn.js';
-declare module 'ethereumjs-abi';
 declare module 'chai-bignumber';
 declare module 'dirty-chai';
-declare module 'yargs';
 
 // HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
 // interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
@@ -31,6 +28,11 @@ declare module 'web3-eth-abi' {
     export function encodeParameters(typesArray: string[], parameters: any[]): string;
 }
 
+declare module 'ethereumjs-abi' {
+    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
+    const methodID: (name: string, types: string[]) => Buffer;
+}
+
 // Truffle injects the following into the global scope
 declare var artifacts: any;
 declare var contract: any;
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index c8ccd0a3a..0a7b8f5ef 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.86",
     "@types/node": "^8.0.53",
     "@types/request-promise-native": "^1.0.2",
-    "@types/yargs": "^8.0.2",
+    "@types/yargs": "^10.0.0",
     "chai": "^4.0.1",
     "chai-as-promised": "^7.1.0",
     "chai-as-promised-typescript-typings": "^0.0.3",