Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Fix BYOC/Solc Config Bug #1467

Merged
merged 18 commits into from
Dec 7, 2018
Merged

Fix BYOC/Solc Config Bug #1467

Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
de4dec6
update compiler solc config for v5
CruzMolina Nov 27, 2018
f6a534e
update default compiler config for v5
CruzMolina Nov 27, 2018
5cff442
Merge branch 'next' of https://github.com/trufflesuite/truffle into v…
CruzMolina Nov 27, 2018
6f218d1
allow compiler settings to be unspecified
CruzMolina Dec 4, 2018
9ea9ec0
revert config compiler settings to correct form
CruzMolina Dec 4, 2018
dcb92f2
oops!
CruzMolina Dec 5, 2018
61c0245
avoid potential namespace collision
CruzMolina Dec 6, 2018
c22f058
update test_ordering test
CruzMolina Dec 6, 2018
f845ae0
update test_supplier test
CruzMolina Dec 6, 2018
08ce852
update util.js
CruzMolina Dec 6, 2018
a8f43cc
update linking.js
CruzMolina Dec 6, 2018
62e55a9
update contracts.js
CruzMolina Dec 6, 2018
5d0fa07
update docker test_supplier options
CruzMolina Dec 6, 2018
3e196c8
update helpers.js
CruzMolina Dec 6, 2018
00c5e0f
Merge branch 'next' into v5-optimizer
CruzMolina Dec 6, 2018
3337302
bump to 0.5.1
CruzMolina Dec 6, 2018
f77c72c
increase counter for geth
CruzMolina Dec 6, 2018
0fa208a
up timeout
CruzMolina Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/truffle-compile/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ var compile = function(sources, options, callback) {

expect.options(options.compilers, ["solc"]);

options.compilers.solc.settings = options.compilers.solc.settings || {};
options.compilers.solc.settings =
options.compilers.solc.settings || options.compilers.solc || {};
CruzMolina marked this conversation as resolved.
Show resolved Hide resolved

// Grandfather in old solc config
if (options.solc) {
options.compilers.solc.settings.evmVersion = options.solc.evmVersion;
options.compilers.solc.settings.optimizer = options.solc.optimizer;
options.compilers.solc.settings = options.solc.settings || options.solc;
}

// Ensure sources have operating system independent paths
Expand Down