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

Dependency update: Update solc/wrapper to 0.8.10 #4413

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Dependency update: Update solc/wrapper to 0.8.10 #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14756f1
Update solc/wrapper to 0.8.10
haltman-at Nov 9, 2021
6c1f9c1
Change 0.4.11 tests to 0.4.9
haltman-at Nov 9, 2021
2b9292a
Update local solc test
haltman-at Nov 9, 2021
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
2 changes: 1 addition & 1 deletion packages/compile-solidity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"original-require": "^1.0.1",
"require-from-string": "^2.0.2",
"semver": "^7.3.4",
"solc": "0.6.9"
"solc": "0.8.10"
},
"devDependencies": {
"@truffle/artifactor": "^4.0.127",
Expand Down
0 ...st/sources/v0.4.11/FilenameWith:Colon.sol → ...est/sources/v0.4.9/FilenameWith:Colon.sol
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/compile-solidity/test/test_oldversions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const compileOptions = {
working_directory: workingDirectory,
compilers: {
solc: {
version: "0.4.11",
version: "0.4.9",
settings: {
optimizer: {
enabled: false,
Expand Down Expand Up @@ -43,7 +43,7 @@ describe("Compile - solidity <0.4.20", function () {
describe("Output repair", function () {
before("get code", function () {
source = fs.readFileSync(
path.join(__dirname, "./sources/v0.4.11/FilenameWith:Colon.sol"),
path.join(__dirname, "./sources/v0.4.9/FilenameWith:Colon.sol"),
"utf-8"
);
});
Expand Down
15 changes: 9 additions & 6 deletions packages/compile-solidity/test/test_supplier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe("CompilerSupplier", function () {
let version4PragmaSource; // ^0.4.21
let version5PragmaSource; // ^0.5.0
let version6PragmaSource; // ^0.6.0
let version8PragmaSource; // ^0.8.0
let versionLatestPragmaSource; // Currently: ^0.8.0
let compileConfig;

Expand Down Expand Up @@ -49,16 +50,18 @@ describe("CompilerSupplier", function () {
path.join(__dirname, "./sources/v0.6.x/Version6Pragma.sol"),
"utf-8"
);
const versionLatestPragma = await fse.readFile(
path.join(__dirname, "./sources/v0.8.x/Version8Pragma.sol"), //update when necessary
const version8Pragma = await fse.readFile(
path.join(__dirname, "./sources/v0.8.x/Version8Pragma.sol"),
"utf-8"
);
const versionLatestPragma = version8Pragma; //update when necessary

oldPragmaPinSource = { "OldPragmaPin.sol": oldPragmaPin };
oldPragmaFloatSource = { "OldPragmaFloat.sol": oldPragmaFloat };
version4PragmaSource = { "NewPragma.sol": version4Pragma };
version5PragmaSource = { "Version5Pragma.sol": version5Pragma };
version6PragmaSource = { "Version6Pragma.sol": version6Pragma };
version8PragmaSource = { "Version8Pragma.sol": version8Pragma };
versionLatestPragmaSource = { "Version8Pragma.sol": versionLatestPragma }; //update when necessary
});

Expand Down Expand Up @@ -130,14 +133,14 @@ describe("CompilerSupplier", function () {
const localPathOptions = Config.default().merge(options);

const { compilations } = await Compile.sources({
sources: version6PragmaSource,
sources: version8PragmaSource,
options: localPathOptions
});
const Version6Pragma = findOne(
"Version6Pragma",
const Version8Pragma = findOne(
"Version8Pragma",
compilations[0].contracts
);
assert(Version6Pragma.contractName === "Version6Pragma");
assert(Version8Pragma.contractName === "Version8Pragma");
});

it("caches releases and uses them if available", async function () {
Expand Down
21 changes: 16 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8953,6 +8953,11 @@ commander@^7.0.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==

commander@^8.1.0:
version "8.3.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==

commander@~2.13.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
Expand Down Expand Up @@ -13028,6 +13033,11 @@ follow-redirects@^1.10.0:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==

follow-redirects@^1.12.1:
version "1.14.5"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381"
integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==

for-each@~0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
Expand Down Expand Up @@ -25878,13 +25888,14 @@ [email protected]:
semver "^5.5.0"
tmp "0.0.33"

solc@0.6.9:
version "0.6.9"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.6.9.tgz#274e3b4323899d76583013f8a42ef4a556a0d81a"
integrity sha512-DZ7lO6fpJQVMffN0vnVufyjQCkJMnqAOaqKWoqqK3ZjqA/Wl/emwFjUgMArUjtNSlQKcPUHN1GsvKZzaOOycXA==
solc@0.8.10:
version "0.8.10"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.8.10.tgz#3f761794677a36cdd8054f4ec57d84bab8455358"
integrity sha512-I/Mcn6J5bEtJqveNLplQm9IRrhemm6v+qkw5S2+wM4x9HItJ1sYdrqVTN3j4DMhFDM3ZbvM0QywVzpPx666PHw==
dependencies:
command-exists "^1.2.8"
commander "3.0.2"
commander "^8.1.0"
follow-redirects "^1.12.1"
fs-extra "^0.30.0"
js-sha3 "0.8.0"
memorystream "^0.3.1"
Expand Down