hardhat 3.2.0 → 3.4.0

package/src/internal/builtin-plugins/solidity/build-system/cache.ts

@@ -17,11 +17,14 @@ export type CompileCache = Record<string, CompileCacheEntry>;
 export interface CompileCacheEntry {
   jobHash: string;
   isolated: boolean;
+  compilerType: string;
   buildInfoPath: string;
   buildInfoOutputPath: string;
   artifactPaths: string[];
   typeFilePath?: string;
   wasm: boolean;
+  artifactsDirectory?: string;
+  emitsTypeDeclarations?: boolean;
 }
 
 const CACHE_FILE_NAME = `compile-cache.json`;

package/src/internal/builtin-plugins/solidity/build-system/compilation-job.ts

@@ -1,10 +1,11 @@
 import type { DependencyGraphImplementation } from "./dependency-graph.js";
 import type { BuildInfo } from "../../../../types/artifacts.js";
-import type { SolcConfig } from "../../../../types/config.js";
+import type { SolidityCompilerConfig } from "../../../../types/config.js";
 import type { HookManager } from "../../../../types/hooks.js";
 import type { CompilationJob } from "../../../../types/solidity/compilation-job.js";
 import type { CompilerInput } from "../../../../types/solidity/compiler-io.js";
 import type { DependencyGraph } from "../../../../types/solidity/dependency-graph.js";
+import type { ToolVersions } from "../../../../types/solidity/solidity-artifacts.js";
 
 import { createHash } from "node:crypto";
 
@@ -16,13 +17,15 @@ import {
   ResolvedFileType,
   type ResolvedFile,
 } from "../../../../types/solidity.js";
+import { DEFAULT_OUTPUT_SELECTION } from "../constants.js";
 
 import { getEvmVersionFromSolcVersion } from "./solc-info.js";
 
 export class CompilationJobImplementation implements CompilationJob {
   public readonly dependencyGraph: DependencyGraph;
-  public readonly solcConfig: SolcConfig;
+  public readonly solcConfig: SolidityCompilerConfig;
   public readonly solcLongVersion: string;
+  public readonly toolVersions?: ToolVersions;
 
   readonly #hooks: HookManager;
   // This map is shared across compilation jobs and is meant to store content hashes of source files
@@ -34,16 +37,18 @@ export class CompilationJobImplementation implements CompilationJob {
 
   constructor(
     dependencyGraph: DependencyGraphImplementation,
-    solcConfig: SolcConfig,
+    solcConfig: SolidityCompilerConfig,
     solcLongVersion: string,
     hooks: HookManager,
     sharedContentHashes: Map<string, string> = new Map(),
+    toolVersions?: ToolVersions,
   ) {
     this.dependencyGraph = dependencyGraph;
     this.solcConfig = solcConfig;
     this.solcLongVersion = solcLongVersion;
     this.#hooks = hooks;
     this.#sharedContentHashes = sharedContentHashes;
+    this.toolVersions = toolVersions;
   }
 
   public async getSolcInput(): Promise<CompilerInput> {
@@ -130,19 +135,14 @@ export class CompilationJobImplementation implements CompilationJob {
     // from other files (e.g. new Foo()), and it won't output its bytecode if
     // it's not asked for. This would prevent EDR from doing any runtime
     // analysis.
-    const outputSelection = await deepClone(settings.outputSelection ?? {});
+    const outputSelection: CompilerInput["settings"]["outputSelection"] =
+      await deepClone(settings.outputSelection ?? {});
     outputSelection["*"] ??= {};
     outputSelection["*"][""] ??= [];
     outputSelection["*"]["*"] ??= [];
 
-    outputSelection["*"][""].push("ast");
-    outputSelection["*"]["*"].push(
-      "abi",
-      "evm.bytecode",
-      "evm.deployedBytecode",
-      "evm.methodIdentifiers",
-      "metadata",
-    );
+    outputSelection["*"][""].push(...DEFAULT_OUTPUT_SELECTION["*"][""]);
+    outputSelection["*"]["*"].push(...DEFAULT_OUTPUT_SELECTION["*"]["*"]);
 
     const sources: { [sourceName: string]: { content: string } } = {};
 
@@ -236,17 +236,50 @@ export class CompilationJobImplementation implements CompilationJob {
     // Changing this shouldn't be taken lightly, as it makes reproducing
     // builds pretty difficult when upgrading Hardhat between versions that
     // change it.
-    const preimage = JSON.stringify({
+
+    const compilerType = this.solcConfig.type;
+
+    // We normalize solcConfig.type to `undefined` so that "solc" and undefined
+    // produce the same hash, for backwards compatibility.
+    const normalizedSolcConfig = { ...this.solcConfig, type: undefined };
+
+    const preimageObject: Record<string, unknown> = {
       format,
       solcLongVersion: this.solcLongVersion,
       smallerSolcInput,
-      solcConfig: this.solcConfig,
+      solcConfig: normalizedSolcConfig,
       userSourceNameMap: this.dependencyGraph.getRootsUserSourceNameMap(),
-    });
+    };
+
+    // Include compiler type in the preimage for non-solc types, so that
+    // different compiler types produce different build IDs.
+    if (compilerType !== undefined && compilerType !== "solc") {
+      preimageObject.compilerType = compilerType;
+    }
+
+    // Include tool versions in the preimage when present, so that
+    // different tool versions produce different build IDs.
+    if (this.toolVersions !== undefined) {
+      preimageObject.toolVersions = this.toolVersions;
+    }
+
+    const preimage = JSON.stringify(preimageObject);
 
     const jobHash = await createNonCryptographicHashId(preimage);
 
-    return `solc-${this.solcConfig.version.replaceAll(".", "_")}-${jobHash}`;
+    const versionPart = this.solcConfig.version.replaceAll(".", "_");
+
+    // For non-solc compiler types, include the compiler type in the build ID.
+    // We keep the `solc-` prefix for all types to avoid breaking codepaths
+    // that look for it.
+    if (compilerType !== undefined && compilerType !== "solc") {
+      /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions --
+        compilerType is `never` in the base type system (only "solc" is registered),
+        but plugins can extend SolidityCompilerConfigPerType to add new compiler types. */
+      return `solc-${versionPart}-${compilerType}-${jobHash}`;
+    }
+
+    return `solc-${versionPart}-${jobHash}`;
   }
 
   #getSourceContentHash(sourceName: string, text: string): any {

package/src/internal/builtin-plugins/solidity/build-system/compiler/compiler.ts

@@ -39,7 +39,7 @@ import * as semver from "semver";
  * @throws Error if the compilation process exits with a non-zero exit code.
  * @throws HardhatInvariantError if the any of the io streams are null.
  */
-async function spawnCompile(
+export async function spawnCompile(
   command: string,
   args: string[],
   input: CompilerInput,

package/src/internal/builtin-plugins/solidity/build-system/compiler/downloader.ts

@@ -25,6 +25,7 @@ import {
 import { getPrefixedHexString } from "@nomicfoundation/hardhat-utils/hex";
 import { download } from "@nomicfoundation/hardhat-utils/request";
 import { MultiProcessMutex } from "@nomicfoundation/hardhat-utils/synchronization";
+import AdmZip from "adm-zip";
 import debug from "debug";
 
 import { NativeCompiler, SolcJsCompiler } from "./compiler.js";
@@ -469,8 +470,6 @@ export class CompilerDownloaderImplementation implements CompilerDownloader {
       downloadPath.endsWith(".zip")
     ) {
       // some window builds are zipped, some are not
-      const { default: AdmZip } = await import("adm-zip");
-
       const solcFolder = path.join(this.#compilersDir, build.version);
       await ensureDir(solcFolder);
 

package/src/internal/builtin-plugins/solidity/build-system/dependency-graph.ts

@@ -205,13 +205,15 @@ export class DependencyGraphImplementation implements DependencyGraph {
   }
 
   public getAllRemappings(): readonly string[] {
-    return this.#dependenciesMap
-      .values()
-      .flatMap((dependencies) =>
-        dependencies.values().flatMap((remappings) => remappings.values()),
-      )
-      .toArray()
-      .sort();
+    return [
+      ...new Set(
+        this.#dependenciesMap
+          .values()
+          .flatMap((dependencies) =>
+            dependencies.values().flatMap((remappings) => remappings.values()),
+          ),
+      ),
+    ].sort();
   }
 
   public toJSON(): DependencyGraphImplementationJson {

package/src/internal/builtin-plugins/solidity/build-system/solc-config-selection.ts

@@ -1,5 +1,5 @@
 import type {
-  SolcConfig,
+  SolidityCompilerConfig,
   SolidityBuildProfileConfig,
 } from "../../../../types/config.js";
 import type { CompilationJobCreationError } from "../../../../types/solidity/build-system.js";
@@ -44,7 +44,9 @@ export class SolcConfigSelector {
    */
   public selectBestSolcConfigForSingleRootGraph(
     subgraph: DependencyGraph,
-  ): { success: true; config: SolcConfig } | CompilationJobCreationError {
+  ):
+    | { success: true; config: SolidityCompilerConfig }
+    | CompilationJobCreationError {
     const roots = subgraph.getRoots();
 
     assertHardhatInvariant(

package/src/internal/builtin-plugins/solidity/build-system/solc-info.ts

@@ -107,6 +107,7 @@ const defaultEvmTargets: { [key: string]: string } = {
   "0.8.31": "osaka",
   "0.8.32": "osaka",
   "0.8.33": "osaka",
+  "0.8.34": "osaka",
 };
 
 export function getEvmVersionFromSolcVersion(

package/src/internal/builtin-plugins/solidity/build-system/warning-suppression.ts

@@ -57,8 +57,8 @@ export function shouldSuppressWarning(
 ): boolean {
   // Compute relative path from project root to test directory.
   // Example:
-  // absoluteSolidityTestsPath: /workspaces/hardhat-4/v-next/example-project/test/contracts
-  // absoluteProjectRoot:       /workspaces/hardhat-4/v-next/example-project
+  // absoluteSolidityTestsPath: /workspaces/hardhat-4/packages/example-project/test/contracts
+  // absoluteProjectRoot:       /workspaces/hardhat-4/packages/example-project
   // relativeTestPath:          test/contracts/ - note the addition of the `/`
   // to avoid partial matches, e.g.: test/contractsUtils/
   const relativeTestPath = path.join(