-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Fix compiler download for old versions in ARM64 #8062
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9b7c1ae
try CI test
ChristopherDedominici 01945b0
fallback to WASM for old ARM64 compilers
ChristopherDedominici c1364fb
Merge branch 'main' of github.com:NomicFoundation/hardhat into fix-co…
ChristopherDedominici eb529d0
use tmp dir in test
ChristopherDedominici ef7e280
Add tests for `hasNativeBuildForPlatform`
ChristopherDedominici e6360cb
remove mocked dir in test
ChristopherDedominici 848e542
Potential fix for pull request finding
ChristopherDedominici 45963d4
Create thick-schools-play.md
ChristopherDedominici File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "hardhat": patch | ||
| --- | ||
|
|
||
| Fixed compiler download for old versions in ARM64 ([8062](https://github.com/NomicFoundation/hardhat/pull/8062)). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,8 @@ import { exists, isBinaryFile } from "@nomicfoundation/hardhat-utils/fs"; | |
| import { getCacheDir } from "@nomicfoundation/hardhat-utils/global-dir"; | ||
| import debug from "debug"; | ||
|
|
||
| import { hasArm64MirrorBuild, hasOfficialArm64Build } from "../solc-info.js"; | ||
|
|
||
| import { NativeCompiler, SolcJsCompiler } from "./compiler.js"; | ||
| import { | ||
| CompilerDownloaderImplementation, | ||
|
|
@@ -28,6 +30,25 @@ async function getGlobalCompilersCacheDir(): Promise<string> { | |
|
|
||
| const log = debug("hardhat:core:solidity:build-system:compiler"); | ||
|
|
||
| /** | ||
| * Returns true if a platform-specific build exists for the given version | ||
| * on the given compiler platform. On non-ARM64 platforms (including WASM) | ||
| * every version is assumed to have a build; on ARM64 Linux only versions | ||
| * in the community mirror (>= 0.5.0) or with official builds (>= 0.8.31) do. | ||
| * | ||
| * Exported only for testing purposes. | ||
| */ | ||
| export function hasNativeBuildForPlatform( | ||
| version: string, | ||
| platform: CompilerPlatform, | ||
| ): boolean { | ||
| if (platform !== CompilerPlatform.LINUX_ARM64) { | ||
| return true; | ||
| } | ||
|
|
||
| return hasOfficialArm64Build(version) || hasArm64MirrorBuild(version); | ||
| } | ||
|
|
||
| export async function downloadSolcCompilers( | ||
| versions: Set<string>, | ||
| quiet: boolean, | ||
|
|
@@ -40,9 +61,20 @@ export async function downloadSolcCompilers( | |
| await getGlobalCompilersCacheDir(), | ||
| ); | ||
|
|
||
| await mainCompilerDownloader.updateCompilerListIfNeeded(versions); | ||
| // Only attempt native downloads for versions that have a native build | ||
| // on this platform. On ARM64 Linux, older versions (< 0.5.0) have no | ||
| // native binary anywhere and would cause the downloader to throw. | ||
| const nativeVersions = [...versions].filter((v) => | ||
| hasNativeBuildForPlatform(v, platform), | ||
| ); | ||
|
|
||
| if (nativeVersions.length > 0) { | ||
| await mainCompilerDownloader.updateCompilerListIfNeeded( | ||
| new Set(nativeVersions), | ||
| ); | ||
| } | ||
|
|
||
| for (const version of versions) { | ||
| for (const version of nativeVersions) { | ||
| if (!(await mainCompilerDownloader.isCompilerDownloaded(version))) { | ||
| if (!quiet) { | ||
| console.log(`Downloading solc ${version}`); | ||
|
|
@@ -155,15 +187,18 @@ async function getCompilerFromVersion( | |
| ) { | ||
| if (!preferWasm) { | ||
| const platform = CompilerDownloaderImplementation.getCompilerPlatform(); | ||
| const compilerDownloader = new CompilerDownloaderImplementation( | ||
| platform, | ||
| await getGlobalCompilersCacheDir(), | ||
| ); | ||
|
|
||
| const compiler = await compilerDownloader.getCompiler(version); | ||
| if (hasNativeBuildForPlatform(version, platform)) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like this double-protection here, in case |
||
| const compilerDownloader = new CompilerDownloaderImplementation( | ||
| platform, | ||
| await getGlobalCompilersCacheDir(), | ||
| ); | ||
|
|
||
| const compiler = await compilerDownloader.getCompiler(version); | ||
|
|
||
| if (compiler !== undefined) { | ||
| return compiler; | ||
| if (compiler !== undefined) { | ||
| return compiler; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The assertHardhatInvariant was redundant because
#getCompilerBuild()(in this file) already guarantees build is never undefined, if the version isn't found, it throws a HardhatError