diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-02-16 04:27:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-16 04:27:43 +0800 |
commit | b75fdd6b66a30196d53331827733b863bed770f0 (patch) | |
tree | 09c7e9fab9f1120e1aec28c2d0ad8d00a8aa9671 /packages/deployer/src/compiler.ts | |
parent | 4b6735227876913aa70c22e1d57f547f97201a3a (diff) | |
parent | 060b02eaed2c7e2946286897b79ccfe828efc95d (diff) | |
download | dexon-sol-tools-b75fdd6b66a30196d53331827733b863bed770f0.tar.gz dexon-sol-tools-b75fdd6b66a30196d53331827733b863bed770f0.tar.zst dexon-sol-tools-b75fdd6b66a30196d53331827733b863bed770f0.zip |
Merge pull request #400 from 0xProject/feature/deployer/selectContracts
Pass in contracts to compile in deployer
Diffstat (limited to 'packages/deployer/src/compiler.ts')
-rw-r--r-- | packages/deployer/src/compiler.ts | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 63db6c865..2b0b81c44 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -17,6 +17,7 @@ import { import { utils } from './utils/utils'; const SOLIDITY_FILE_EXTENSION = '.sol'; +const ALL_CONTRACTS_IDENTIFIER = '*'; export class Compiler { private _contractsDir: string; @@ -25,6 +26,7 @@ export class Compiler { private _artifactsDir: string; private _contractSourcesIfExists?: ContractSources; private _solcErrors: Set<string>; + private _specifiedContracts: Set<string>; /** * Recursively retrieves Solidity source code from directory. * @param dirPath Directory to search. @@ -106,6 +108,7 @@ export class Compiler { this._optimizerEnabled = opts.optimizerEnabled; this._artifactsDir = opts.artifactsDir; this._solcErrors = new Set(); + this._specifiedContracts = opts.specifiedContracts; } /** * Compiles all Solidity files found in contractsDir and writes JSON artifacts to artifactsDir. @@ -136,6 +139,8 @@ 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._specifiedContracts.has(ALL_CONTRACTS_IDENTIFIER) || this._specifiedContracts.has(contractName); let currentArtifactString: string; let currentArtifact: ContractArtifact; @@ -150,11 +155,12 @@ export class Compiler { oldNetworks = currentArtifact.networks; const oldNetwork: ContractData = oldNetworks[this._networkId]; shouldCompile = - _.isUndefined(oldNetwork) || - oldNetwork.keccak256 !== sourceHash || - oldNetwork.optimizer_enabled !== this._optimizerEnabled; + (_.isUndefined(oldNetwork) || + oldNetwork.keccak256 !== sourceHash || + oldNetwork.optimizer_enabled !== this._optimizerEnabled) && + isContractSpecified; } catch (err) { - shouldCompile = true; + shouldCompile = isContractSpecified; } if (!shouldCompile) { |