Fix checks, add contract list to compile script in package.json

2 files changed, 4 insertions, 3 deletions

diff --git a/packages/deployer/src/cli.ts b/packages/deployer/src/cli.ts
index 5e0f2145b..bc1ec8421 100644
--- a/packages/deployer/src/cli.ts
+++ b/packages/deployer/src/cli.ts
@@ -100,7 +100,7 @@ async function onDeployCommand(argv: CliOptions): Promise<void> {
 function generateContractsToCompileSet(contracts: string): Set<string> {
     const contractsToCompile = new Set();
     const contractsArray = contracts.split(',');
-    _.forEach(contracts, contractName => {
+    _.forEach(contractsArray, contractName => {
         contractsToCompile.add(contractName);
     });
     return contractsToCompile;
diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts
index 4e5518d0e..beeda1260 100644
--- a/packages/deployer/src/compiler.ts
+++ b/packages/deployer/src/compiler.ts
@@ -139,6 +139,7 @@ export class Compiler {
         const contractName = path.basename(contractBaseName, SOLIDITY_FILE_EXTENSION);
         const currentArtifactPath = `${this._artifactsDir}/${contractName}.json`;
         const sourceHash = `0x${ethUtil.sha3(source).toString('hex')}`;
+        const isContractSpecified = this._contractsToCompile.has(ALL_CONTRACTS_IDENTIFIER) || this._contractsToCompile.has(contractName);
 
         let currentArtifactString: string;
         let currentArtifact: ContractArtifact;
@@ -156,9 +157,9 @@ export class Compiler {
                 (_.isUndefined(oldNetwork) ||
                 oldNetwork.keccak256 !== sourceHash ||
                 oldNetwork.optimizer_enabled !== this._optimizerEnabled) &&
-                (this._contractsToCompile.has(ALL_CONTRACTS_IDENTIFIER) || this._contractsToCompile.has(contractName));
+                isContractSpecified;
         } catch (err) {
-            shouldCompile = true;
+            shouldCompile = isContractSpecified;
         }
 
         if (!shouldCompile) {