hardhat 3.4.3 → 3.4.5

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

@@ -43,7 +43,6 @@ import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
 import {
   exists,
   ensureDir,
-  getAllDirectoriesMatching,
   getAllFilesMatching,
   move,
   readJsonFile,
@@ -1098,29 +1097,46 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
 
     const userSourceNamesSet = new Set(userSourceNames);
 
-    for (const file of await getAllDirectoriesMatching(
+    const buildInfosDir = path.join(artifactsDirectory, `build-info`);
+
+    // We accept both `.json` files and per-file `artifacts.d.ts` files:
+    // source files that compile but produce no contracts emit only the
+    // declaration file, but their parent dir still belongs in the cleanup
+    // candidate set.
+    // TODO: This logic is originated with the artifacts manager, but now uses both json files and `artifacts.d.ts` as the test
+    const allArtifactFiles = await getAllFilesMatching(
       artifactsDirectory,
-      (d) => d.endsWith(".sol"),
-    )) {
+      (p) => {
+        // Ignore top level files (e.g. the project-wide artifacts.d.ts)
+        if (
+          p.indexOf(path.sep, artifactsDirectory.length + path.sep.length) ===
+          -1
+        ) {
+          return false;
+        }
+        return p.endsWith(".json") || path.basename(p) === "artifacts.d.ts";
+      },
+      (dir) => dir !== buildInfosDir,
+    );
+
+    const artifactDirs = new Set(
+      allArtifactFiles.map((file) => path.dirname(file)),
+    );
+    const removedDirs = new Set<string>();
+
+    for (const dir of artifactDirs) {
       const relativePath = toForwardSlash(
-        path.relative(artifactsDirectory, file),
+        path.relative(artifactsDirectory, dir),
       );
 
       if (!userSourceNamesSet.has(relativePath)) {
-        await remove(file);
+        await remove(dir);
+        removedDirs.add(dir);
       }
     }
 
-    const buildInfosDir = path.join(artifactsDirectory, `build-info`);
-
-    // TODO: This logic is duplicated with respect to the artifacts manager
-    const artifactPaths = await getAllFilesMatching(
-      artifactsDirectory,
-      (p) =>
-        p.endsWith(".json") && // Only consider json files
-        // Ignore top level json files
-        p.indexOf(path.sep, artifactsDirectory.length + path.sep.length) !== -1,
-      (dir) => dir !== buildInfosDir,
+    const artifactPaths = allArtifactFiles.filter(
+      (p) => p.endsWith(".json") && !removedDirs.has(path.dirname(p)),
     );
 
     const reachableBuildInfoIds = await Promise.all(

package/src/internal/builtin-plugins/solidity/build-system/resolver/remapped-npm-packages-graph.ts

@@ -478,6 +478,13 @@ export class RemappedNpmPackagesGraphImplementation
       (f) => !f.endsWith("node_modules"),
     );
 
+    // Sort by path so the first-wins dedup downstream is deterministic across
+    // filesystems. We sort here (and not after hook composition) so that hooks
+    // can rely on the contract that remappings they append after next() come
+    // last — e.g. hardhat-foundry appends forge's remappings after the
+    // package's own remappings.txt files, expecting remappings.txt to win.
+    remappingsTxtFiles.sort();
+
     const results: Array<{ remappings: string[]; source: string }> = [];
     for (const file of remappingsTxtFiles) {
       const contents = await readUtf8File(file);

package/src/internal/builtin-plugins/solidity/index.ts

@@ -3,7 +3,7 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 import { ArgumentType } from "../../../types/arguments.js";
 import { globalOption, task } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const buildTask = task("build", "Build project")
   .addFlag({

package/src/internal/builtin-plugins/solidity/type-extensions.ts

@@ -11,7 +11,6 @@ import type {
   CompilerOutput,
 } from "../../../types/solidity.js";
 
-import "../../../types/config.js";
 declare module "../../../types/config.js" {
   /**
    * An interface with a key per compiler type.
@@ -318,21 +317,18 @@ declare module "../../../types/config.js" {
   }
 }
 
-import "../../../types/hre.js";
 declare module "../../../types/hre.js" {
   export interface HardhatRuntimeEnvironment {
     solidity: SolidityBuildSystem;
   }
 }
 
-import "../../../types/global-options.js";
 declare module "../../../types/global-options.js" {
   export interface GlobalOptions {
     buildProfile: string;
   }
 }
 
-import "../../../types/hooks.js";
 declare module "../../../types/hooks.js" {
   export interface HardhatHooks {
     solidity: SolidityHooks;

package/src/internal/builtin-plugins/solidity-test/index.ts

@@ -4,7 +4,7 @@ import { ArgumentType } from "hardhat/types/arguments";
 
 import { task } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:solidity-tests",

package/src/internal/builtin-plugins/solidity-test/inline-config/constants.ts

@@ -1,8 +1,10 @@
 export const HARDHAT_CONFIG_PREFIX = "hardhat-config:";
 export const FORGE_CONFIG_PREFIX = "forge-config:";
 
-/** All supported inline config keys and their expected value types. */
-export const KEY_TYPES: Record<string, "number" | "boolean"> = {
+/**
+ * All supported inline config keys and their expected value types.
+ */
+export const KEY_TYPES: Record<string, "number" | "boolean" | "string"> = {
   "fuzz.runs": "number",
   "fuzz.maxTestRejects": "number",
   "fuzz.showLogs": "boolean",
@@ -13,6 +15,8 @@ export const KEY_TYPES: Record<string, "number" | "boolean"> = {
   "invariant.callOverride": "boolean",
   "invariant.timeout": "number",
   allowInternalExpectRevert: "boolean",
+  isolate: "boolean",
+  evmVersion: "string",
 };
 
 /** Top-level key categories (e.g. "fuzz", "invariant", "allowInternalExpectRevert"). */

package/src/internal/builtin-plugins/solidity-test/inline-config/helpers.ts

@@ -1,6 +1,7 @@
 import type { RawInlineOverride } from "./types.js";
 import type { TestFunctionConfigOverride } from "@nomicfoundation/edr";
 
+import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
 import { bytesIncludesUtf8String } from "@nomicfoundation/hardhat-utils/bytes";
 
 import { getFullyQualifiedName } from "../../../../utils/contract-names.js";
@@ -57,10 +58,20 @@ export function buildConfigOverride(
 
   for (const override of overrides) {
     const expectedType = KEY_TYPES[override.key];
-    const parsed =
-      expectedType === "number"
-        ? Number(override.rawValue)
-        : override.rawValue.toLowerCase() === "true";
+    let parsed: number | boolean | string;
+    if (expectedType === "number") {
+      parsed = Number(override.rawValue);
+    } else if (expectedType === "boolean") {
+      parsed = override.rawValue.toLowerCase() === "true";
+    } else if (expectedType === "string") {
+      // Validation has already proven the surrounding double quotes.
+      parsed = override.rawValue.slice(1, -1);
+    } else {
+      assertHardhatInvariant(
+        false,
+        `Unhandled inline config value type for key ${override.key}`,
+      );
+    }
 
     const dotIndex = override.key.indexOf(".");
     if (dotIndex === -1) {

package/src/internal/builtin-plugins/solidity-test/inline-config/validation.ts

@@ -1,6 +1,9 @@
 import type { RawInlineOverride } from "./types.js";
 
-import { HardhatError } from "@nomicfoundation/hardhat-errors";
+import {
+  HardhatError,
+  assertHardhatInvariant,
+} from "@nomicfoundation/hardhat-errors";
 
 import { KEY_TYPES } from "./constants.js";
 import { getFunctionFqn } from "./helpers.js";
@@ -9,8 +12,9 @@ import { getFunctionFqn } from "./helpers.js";
  * Validates a list of raw inline overrides, checking for:
  * - Valid keys
  * - No duplicate keys for the same function
- * - Values of the expected type (numbers must be non-negative integers, booleans
- *   must be "true" or "false")
+ * - Values of the expected type (numbers must be non-negative integers,
+ *   booleans must be "true" or "false", strings must be a non-empty
+ *   double-quoted literal)
  *
  * Throws a HardhatError if any validation fails.
  */
@@ -104,7 +108,7 @@ export function validateInlineOverrides(overrides: RawInlineOverride[]): void {
           },
         );
       }
-    } else {
+    } else if (expectedType === "boolean") {
       const lowerValue = rawValue.toLowerCase();
       if (lowerValue !== "true" && lowerValue !== "false") {
         throw new HardhatError(
@@ -117,6 +121,23 @@ export function validateInlineOverrides(overrides: RawInlineOverride[]): void {
           },
         );
       }
+    } else if (expectedType === "string") {
+      if (!/^"[^"\n]+"$/.test(rawValue)) {
+        throw new HardhatError(
+          HardhatError.ERRORS.CORE.SOLIDITY_TESTS.INLINE_CONFIG_INVALID_VALUE,
+          {
+            value: rawValue,
+            key: rawKey,
+            expectedType: "non-empty double-quoted string",
+            functionFqn,
+          },
+        );
+      }
+    } else {
+      assertHardhatInvariant(
+        false,
+        `Unhandled inline config value type for key ${key}`,
+      );
     }
   }
 }

package/src/internal/builtin-plugins/solidity-test/type-extensions.ts

@@ -1,4 +1,3 @@
-import "../../../types/config.js";
 import type {
   SensitiveString,
   ResolvedConfigurationVariable,

package/src/internal/builtin-plugins/test/index.ts

@@ -3,7 +3,7 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 import { ArgumentType } from "../../../types/arguments.js";
 import { task } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:test",

package/src/internal/builtin-plugins/test/type-extensions.ts

@@ -1,4 +1,3 @@
-import "../../../types/hooks.js";
 import type {
   HardhatTestConfig,
   HardhatTestUserConfig,