crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected whitespace (no functional changes)

Browse Source
This commit is contained in:
F. Eugene Aumson
2018-08-13 23:59:00 -07:00
parent 014d71d5ae
commit db6de490b2
1 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
packages/sol-compiler/src/compiler.ts
View File

@@ -154,46 +154,48 @@ export class Compiler {
} = {};
for (const contractName of contractNames) {
const contractSource = this._resolver.resolve(contractName);
contractData[contractSource.path] = {
contractName,
currentArtifactIfExists: await getContractArtifactIfExistsAsync(this._artifactsDir, contractName),
sourceTreeHashHex: `0x${this._getSourceTreeHash(
path.join(this._contractsDir, contractSource.path),
).toString('hex')}`,
};
let shouldCompile = false;
if (_.isUndefined(contractData[contractSource.path].currentArtifactIfExists)) {
shouldCompile = true;
} else {
const currentArtifact = contractData[contractSource.path].currentArtifactIfExists as ContractArtifact;
const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION;
const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings);
const didSourceChange =
currentArtifact.sourceTreeHashHex !== contractData[contractSource.path].sourceTreeHashHex;
shouldCompile = !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
}
if (!shouldCompile) {
continue;
}
let solcVersion = this._solcVersionIfExists;
if (_.isUndefined(solcVersion)) {
const solcVersionRange = parseSolidityVersionRange(contractSource.source);
const availableCompilerVersions = _.keys(binPaths);
solcVersion = semver.maxSatisfying(availableCompilerVersions, solcVersionRange);
}
if (_.isUndefined(inputsByVersion[solcVersion])) {
inputsByVersion[solcVersion] = {
standardInput: {
language: 'Solidity',
sources: {},
settings: this._compilerSettings,
},
contractsToCompile: [],
const contractSource = this._resolver.resolve(contractName);
contractData[contractSource.path] = {
contractName,
currentArtifactIfExists: await getContractArtifactIfExistsAsync(this._artifactsDir, contractName),
sourceTreeHashHex: `0x${this._getSourceTreeHash(
path.join(this._contractsDir, contractSource.path),
).toString('hex')}`,
};
}
inputsByVersion[solcVersion].standardInput.sources[contractSource.path] = { content: contractSource.source };
inputsByVersion[solcVersion].contractsToCompile.push(contractSource.path);
let shouldCompile = false;
if (_.isUndefined(contractData[contractSource.path].currentArtifactIfExists)) {
shouldCompile = true;
} else {
const currentArtifact = contractData[contractSource.path].currentArtifactIfExists as ContractArtifact;
const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION;
const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings);
const didSourceChange =
currentArtifact.sourceTreeHashHex !== contractData[contractSource.path].sourceTreeHashHex;
shouldCompile = !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange;
}
if (!shouldCompile) {
continue;
}
let solcVersion = this._solcVersionIfExists;
if (_.isUndefined(solcVersion)) {
const solcVersionRange = parseSolidityVersionRange(contractSource.source);
const availableCompilerVersions = _.keys(binPaths);
solcVersion = semver.maxSatisfying(availableCompilerVersions, solcVersionRange);
}
if (_.isUndefined(inputsByVersion[solcVersion])) {
inputsByVersion[solcVersion] = {
standardInput: {
language: 'Solidity',
sources: {},
settings: this._compilerSettings,
},
contractsToCompile: [],
};
}
inputsByVersion[solcVersion].standardInput.sources[contractSource.path] = {
content: contractSource.source,
};
inputsByVersion[solcVersion].contractsToCompile.push(contractSource.path);
}
for (const solcVersion in inputsByVersion) {