hardhat 3.4.1 → 3.4.2

package/src/internal/builtin-plugins/coverage/hook-handlers/hre.ts

@@ -1,26 +1,36 @@
 import type { HardhatRuntimeEnvironmentHooks } from "../../../../types/hooks.js";
+import type { CoverageManagerImplementation as CoverageManagerImplementationT } from "../coverage-manager.js";
 
-import { CoverageManagerImplementation } from "../coverage-manager.js";
-import { getCoveragePath, setCoverageManager } from "../helpers.js";
+import { getCoveragePath, setCoverageManager } from "../helpers/accessors.js";
+
+let CoverageManagerImplementation:
+  | typeof CoverageManagerImplementationT
+  | undefined;
 
 export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
   created: async (context, hre) => {
-    if (context.globalOptions.coverage) {
-      const coveragePath = getCoveragePath(hre.config.paths.root);
-      const coverageManager = new CoverageManagerImplementation(coveragePath);
+    if (!context.globalOptions.coverage) {
+      return;
+    }
 
-      setCoverageManager(hre, coverageManager);
+    if (CoverageManagerImplementation === undefined) {
+      ({ CoverageManagerImplementation } = await import(
+        "../coverage-manager.js"
+      ));
+    }
 
-      // NOTE: We register this hook dynamically because we use the information about
-      // the existence of onCoverageData hook handlers to determine whether coverage
-      // is enabled or not.
-      hre.hooks.registerHandlers("network", {
-        onCoverageData: async (_context, coverageData) => {
-          await coverageManager.addData(coverageData);
+    const coveragePath = getCoveragePath(hre.config.paths.root);
+    const coverageManager = new CoverageManagerImplementation(coveragePath);
 
-          return;
-        },
-      });
-    }
+    setCoverageManager(hre, coverageManager);
+
+    // NOTE: We register this hook dynamically because we use the information about
+    // the existence of onCoverageData hook handlers to determine whether coverage
+    // is enabled or not.
+    hre.hooks.registerHandlers("network", {
+      onCoverageData: async (_context, coverageData) => {
+        await coverageManager.addData(coverageData);
+      },
+    });
   },
 });

package/src/internal/builtin-plugins/coverage/hook-handlers/solidity.ts

@@ -9,7 +9,7 @@ import { readUtf8File } from "@nomicfoundation/hardhat-utils/fs";
 import { findClosestPackageRoot } from "@nomicfoundation/hardhat-utils/package";
 import debug from "debug";
 
-import { getCoverageManager } from "../helpers.js";
+import { getCoverageManager } from "../helpers/accessors.js";
 import { instrumentSolidityFileForCompilationJob } from "../instrumentation.js";
 
 const log = debug("hardhat:core:coverage:hook-handlers:solidity");

package/src/internal/builtin-plugins/coverage/hook-handlers/test.ts

@@ -1,6 +1,6 @@
 import type { HookContext, TestHooks } from "../../../../types/hooks.js";
 
-import { getCoverageManager } from "../helpers.js";
+import { getCoverageManager } from "../helpers/accessors.js";
 
 export default async (): Promise<Partial<TestHooks>> => ({
   onTestRunStart: async (context, id, next) => {

package/src/internal/builtin-plugins/gas-analytics/helpers/accessors.ts

@@ -1,3 +1,12 @@
+// NOTE: This file is imported from hot paths — the plugin's `created` hook
+// handler and task-actions that may run on every `hardhat test` invocation
+// regardless of whether the feature is enabled. It must stay lightweight:
+// do not add top-level imports that pull in the gas-analytics-manager module
+// graph (chalk, debug, node:crypto, file-system traversal, etc.), or the
+// `--gas-stats` lazy-load is silently defeated for every caller.
+// If a new helper needs a heavy dependency, put it in a sibling file
+// (e.g. `helpers/utils.ts`) so the accessors file's import cost stays flat.
+
 import type { HookContext } from "../../../../types/hooks.js";
 import type { HardhatRuntimeEnvironment } from "../../../../types/hre.js";
 import type { GasAnalyticsManager } from "../types.js";
@@ -5,16 +14,14 @@ import type { GasAnalyticsManager } from "../types.js";
 import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
 
 import { HardhatRuntimeEnvironmentImplementation } from "../../../core/hre.js";
-import { GasAnalyticsManagerImplementation } from "../gas-analytics-manager.js";
 
 export function getGasAnalyticsManager(
   hookContextOrHre: HookContext | HardhatRuntimeEnvironment,
 ): GasAnalyticsManager {
   assertHardhatInvariant(
-    "_gasAnalytics" in hookContextOrHre &&
-      hookContextOrHre._gasAnalytics instanceof
-        GasAnalyticsManagerImplementation,
-    "Expected _gasAnalytics to be an instance of GasAnalyticsManagerImplementation",
+    hookContextOrHre instanceof HardhatRuntimeEnvironmentImplementation &&
+      hookContextOrHre._gasAnalytics !== undefined,
+    "Expected _gasAnalytics to be installed on the HRE",
   );
   return hookContextOrHre._gasAnalytics;
 }

package/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts

@@ -1,29 +1,41 @@
 import type { HardhatRuntimeEnvironmentHooks } from "../../../../types/hooks.js";
+import type { GasAnalyticsManagerImplementation as GasAnalyticsManagerImplementationT } from "../gas-analytics-manager.js";
 
-import { GasAnalyticsManagerImplementation } from "../gas-analytics-manager.js";
 import { setGasAnalyticsManager } from "../helpers/accessors.js";
 
+let GasAnalyticsManagerImplementation:
+  | typeof GasAnalyticsManagerImplementationT
+  | undefined;
+
 export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
   created: async (context, hre) => {
     if (
-      context.globalOptions.gasStats ||
-      context.globalOptions.gasStatsJson !== undefined
+      !context.globalOptions.gasStats &&
+      context.globalOptions.gasStatsJson === undefined
     ) {
-      const gasAnalyticsManager = new GasAnalyticsManagerImplementation(
-        hre.config.paths.cache,
-      );
-
-      setGasAnalyticsManager(hre, gasAnalyticsManager);
+      return;
+    }
 
-      // NOTE: We register this hook dynamically to avoid a circular dependency
-      // between gas-analytics and network-manager plugins. The network-manager
-      // checks for the existence of onGasReported handlers to determine if gas
-      // analytics is enabled, rather than directly checking the global option.
-      hre.hooks.registerHandlers("network", {
-        onGasMeasurement: (_context, gasMeasurement) => {
-          gasAnalyticsManager.addGasMeasurement(gasMeasurement);
-        },
-      });
+    if (GasAnalyticsManagerImplementation === undefined) {
+      ({ GasAnalyticsManagerImplementation } = await import(
+        "../gas-analytics-manager.js"
+      ));
     }
+
+    const gasAnalyticsManager = new GasAnalyticsManagerImplementation(
+      hre.config.paths.cache,
+    );
+
+    setGasAnalyticsManager(hre, gasAnalyticsManager);
+
+    // NOTE: We register this hook dynamically to avoid a circular dependency
+    // between gas-analytics and network-manager plugins. The network-manager
+    // checks for the existence of onGasReported handlers to determine if gas
+    // analytics is enabled, rather than directly checking the global option.
+    hre.hooks.registerHandlers("network", {
+      onGasMeasurement: (_context, gasMeasurement) => {
+        gasAnalyticsManager.addGasMeasurement(gasMeasurement);
+      },
+    });
   },
 });

package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts

@@ -7,6 +7,7 @@ import { ensureError } from "@nomicfoundation/hardhat-utils/error";
 import {
   FileNotFoundError,
   readdir,
+  readdirOrEmpty,
   readJsonFile,
   remove,
   writeJsonFile,
@@ -116,9 +117,8 @@ async function deleteOrphanedSnapshotFiles(
   snapshotsDir: string,
   currentGroups: Set<string>,
 ): Promise<void> {
-  let dirEntries: string[];
   try {
-    dirEntries = await readdir(snapshotsDir);
+    const dirEntries = await readdirOrEmpty(snapshotsDir);
 
     for (const entry of dirEntries) {
       if (entry.endsWith(".json")) {
@@ -131,10 +131,6 @@ async function deleteOrphanedSnapshotFiles(
     }
   } catch (error) {
     ensureError(error);
-    // Directory doesn't exist yet, nothing to clean up
-    if (error instanceof FileNotFoundError) {
-      return;
-    }
     throw new HardhatError(
       HardhatError.ERRORS.CORE.SOLIDITY_TESTS.SNAPSHOT_WRITE_ERROR,
       { snapshotsPath: snapshotsDir, error: error.message },

package/src/internal/builtin-plugins/network-manager/config-resolution.ts

@@ -36,7 +36,7 @@ import { DEFAULT_CHAIN_DESCRIPTORS } from "./chain-descriptors.js";
 import {
   DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS,
   EDR_NETWORK_DEFAULT_COINBASE,
-} from "./edr/edr-provider.js";
+} from "./edr/edr-constants.js";
 import { getCurrentHardfork } from "./edr/types/hardfork.js";
 import { isHttpNetworkHdAccountsUserConfig } from "./type-validation.js";
 

package/src/internal/builtin-plugins/network-manager/edr/edr-constants.ts

@@ -0,0 +1,61 @@
+import type { EdrNetworkHDAccountsConfig } from "../../../../types/config.js";
+import type { DefaultHDAccountsConfigParams } from "../accounts/constants.js";
+
+import { deepEqual } from "@nomicfoundation/hardhat-utils/lang";
+
+import { DEFAULT_HD_ACCOUNTS_CONFIG_PARAMS } from "../accounts/constants.js";
+
+export const EDR_NETWORK_DEFAULT_COINBASE =
+  "0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e";
+
+interface EdrNetworkDefaultHDAccountsConfigParams
+  extends DefaultHDAccountsConfigParams {
+  mnemonic: string;
+  accountsBalance: bigint;
+}
+
+export const EDR_NETWORK_MNEMONIC =
+  "test test test test test test test test test test test junk";
+export const DEFAULT_EDR_NETWORK_BALANCE = 10000000000000000000000n;
+export const DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS: EdrNetworkDefaultHDAccountsConfigParams =
+  {
+    ...DEFAULT_HD_ACCOUNTS_CONFIG_PARAMS,
+    mnemonic: EDR_NETWORK_MNEMONIC,
+    accountsBalance: DEFAULT_EDR_NETWORK_BALANCE,
+  };
+
+export async function isDefaultEdrNetworkHDAccountsConfig(
+  accounts: EdrNetworkHDAccountsConfig,
+): Promise<boolean> {
+  return await deepEqual(
+    {
+      ...accounts,
+      mnemonic: await accounts.mnemonic.get(),
+      passphrase: await accounts.passphrase.get(),
+    },
+    DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS,
+  );
+}
+
+export const EDR_NETWORK_DEFAULT_PRIVATE_KEYS: string[] = [
+  "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+  "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d",
+  "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a",
+  "0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6",
+  "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a",
+  "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba",
+  "0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e",
+  "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356",
+  "0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97",
+  "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6",
+  "0xf214f2b2cd398c806f84e317254e0f0b801d0643303237d97a22a48e01628897",
+  "0x701b615bbdfb9de65240bc28bd21bbc0d996645a3dd57e7b12bc2bdf6f192c82",
+  "0xa267530f49f8280200edf313ee7af6b827f2a8bce2897751d06a843f644967b1",
+  "0x47c99abed3324a2707c28affff1267e45918ec8c3f20b8aa892e8b065d2942dd",
+  "0xc526ee95bf44d8fc405a158bb884d9d1238d99f0612e9f33d006bb0789009aaa",
+  "0x8166f546bab6da521a8369cab06c5d2b9e46670292d85c875ee9ec20e84ffb61",
+  "0xea6c44ac03bff858b476bba40716402b03e41b8e97e276d1baec7c37d42484a0",
+  "0x689af8efa8c651a91ad287602527f3af2fe9f6501a7ac4b061667b5a93e037fd",
+  "0xde9be858da4a475276426320d5e9262ecfc3ba460bfac56360bfa6c4c28b4ee0",
+  "0xdf57089febbacf7ba0bc227dafbffa9fc08a93fdc68e1e42411a14efcf23656e",
+];

package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts

@@ -3,7 +3,6 @@ import type { LoggerConfig } from "./types/logger.js";
 import type {
   ChainDescriptorsConfig,
   EdrNetworkConfig,
-  EdrNetworkHDAccountsConfig,
 } from "../../../../types/config.js";
 import type {
   EthSubscription,
@@ -13,7 +12,6 @@ import type {
   SuccessfulJsonRpcResponse,
 } from "../../../../types/providers.js";
 import type { RequireField } from "../../../../types/utils.js";
-import type { DefaultHDAccountsConfigParams } from "../accounts/constants.js";
 import type { JsonRpcRequestWrapperFunction } from "../network-manager.js";
 import type { TraceOutputManager } from "./utils/trace-output.js";
 import type {
@@ -33,14 +31,12 @@ import {
 import { toSeconds } from "@nomicfoundation/hardhat-utils/date";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
 import { numberToHexString } from "@nomicfoundation/hardhat-utils/hex";
-import { deepEqual } from "@nomicfoundation/hardhat-utils/lang";
 import debug from "debug";
 
 import { sendErrorTelemetry } from "../../../cli/telemetry/error-reporter/reporter.js";
 import { EDR_NETWORK_REVERT_SNAPSHOT_EVENT } from "../../../constants.js";
 import { hardhatChainTypeToEdrChainType } from "../../../edr/chain-type.js";
 import { getGlobalEdrContext } from "../../../edr/context.js";
-import { DEFAULT_HD_ACCOUNTS_CONFIG_PARAMS } from "../accounts/constants.js";
 import { BaseProvider } from "../base-provider.js";
 import { getJsonRpcRequest, isFailedJsonRpcResponse } from "../json-rpc.js";
 import {
@@ -65,61 +61,6 @@ import { printLine, replaceLastLine } from "./utils/logger.js";
 
 const log = debug("hardhat:core:hardhat-network:provider");
 
-export const EDR_NETWORK_DEFAULT_COINBASE =
-  "0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e";
-
-interface EdrNetworkDefaultHDAccountsConfigParams
-  extends DefaultHDAccountsConfigParams {
-  mnemonic: string;
-  accountsBalance: bigint;
-}
-
-export const EDR_NETWORK_MNEMONIC =
-  "test test test test test test test test test test test junk";
-export const DEFAULT_EDR_NETWORK_BALANCE = 10000000000000000000000n;
-export const DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS: EdrNetworkDefaultHDAccountsConfigParams =
-  {
-    ...DEFAULT_HD_ACCOUNTS_CONFIG_PARAMS,
-    mnemonic: EDR_NETWORK_MNEMONIC,
-    accountsBalance: DEFAULT_EDR_NETWORK_BALANCE,
-  };
-
-export async function isDefaultEdrNetworkHDAccountsConfig(
-  accounts: EdrNetworkHDAccountsConfig,
-): Promise<boolean> {
-  return await deepEqual(
-    {
-      ...accounts,
-      mnemonic: await accounts.mnemonic.get(),
-      passphrase: await accounts.passphrase.get(),
-    },
-    DEFAULT_EDR_NETWORK_HD_ACCOUNTS_CONFIG_PARAMS,
-  );
-}
-
-export const EDR_NETWORK_DEFAULT_PRIVATE_KEYS: string[] = [
-  "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
-  "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d",
-  "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a",
-  "0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6",
-  "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a",
-  "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba",
-  "0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e",
-  "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356",
-  "0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97",
-  "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6",
-  "0xf214f2b2cd398c806f84e317254e0f0b801d0643303237d97a22a48e01628897",
-  "0x701b615bbdfb9de65240bc28bd21bbc0d996645a3dd57e7b12bc2bdf6f192c82",
-  "0xa267530f49f8280200edf313ee7af6b827f2a8bce2897751d06a843f644967b1",
-  "0x47c99abed3324a2707c28affff1267e45918ec8c3f20b8aa892e8b065d2942dd",
-  "0xc526ee95bf44d8fc405a158bb884d9d1238d99f0612e9f33d006bb0789009aaa",
-  "0x8166f546bab6da521a8369cab06c5d2b9e46670292d85c875ee9ec20e84ffb61",
-  "0xea6c44ac03bff858b476bba40716402b03e41b8e97e276d1baec7c37d42484a0",
-  "0x689af8efa8c651a91ad287602527f3af2fe9f6501a7ac4b061667b5a93e037fd",
-  "0xde9be858da4a475276426320d5e9262ecfc3ba460bfac56360bfa6c4c28b4ee0",
-  "0xdf57089febbacf7ba0bc227dafbffa9fc08a93fdc68e1e42411a14efcf23656e",
-];
-
 interface EdrProviderConfig {
   chainDescriptors: ChainDescriptorsConfig;
   networkConfig: RequireField<EdrNetworkConfig, "chainType">;

package/src/internal/builtin-plugins/network-manager/edr/types/hardfork.ts

@@ -1,12 +1,6 @@
 import type { ChainType } from "../../../../../types/network.js";
 
-import { l1HardforkLatest, opLatestHardfork } from "@nomicfoundation/edr";
-
 import { OPTIMISM_CHAIN_TYPE } from "../../../../constants.js";
-import {
-  edrL1HardforkToHardhatL1HardforkName,
-  edrOpHardforkToHardhatOpHardforkName,
-} from "../utils/convert-to-edr.js";
 
 export enum L1HardforkName {
   FRONTIER = "chainstart",
@@ -51,9 +45,9 @@ export function getHardforks(chainType: ChainType): string[] {
 }
 
 export function getCurrentHardfork(chainType: ChainType): string {
-  return chainType === OPTIMISM_CHAIN_TYPE
-    ? edrOpHardforkToHardhatOpHardforkName(opLatestHardfork())
-    : edrL1HardforkToHardhatL1HardforkName(l1HardforkLatest());
+  const order =
+    chainType === OPTIMISM_CHAIN_TYPE ? OP_HARDFORK_ORDER : L1_HARDFORK_ORDER;
+  return order[order.length - 1];
 }
 
 /**

package/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts

@@ -61,7 +61,7 @@ import {
   DEFAULT_EDR_NETWORK_BALANCE,
   EDR_NETWORK_DEFAULT_PRIVATE_KEYS,
   isDefaultEdrNetworkHDAccountsConfig,
-} from "../edr-provider.js";
+} from "../edr-constants.js";
 import { L1HardforkName, OpHardforkName } from "../types/hardfork.js";
 
 import { getL1HardforkName, getOpHardforkName } from "./hardfork.js";

package/src/internal/builtin-plugins/node/helpers.ts

@@ -17,7 +17,7 @@ import chalk from "chalk";
 let microEthSigner: typeof MicroEthSignerT | undefined;
 
 import { sendErrorTelemetry } from "../../cli/telemetry/error-reporter/reporter.js";
-import { isDefaultEdrNetworkHDAccountsConfig } from "../network-manager/edr/edr-provider.js";
+import { isDefaultEdrNetworkHDAccountsConfig } from "../network-manager/edr/edr-constants.js";
 import { normalizeEdrNetworkAccountsConfig } from "../network-manager/edr/utils/convert-to-edr.js";
 
 export async function formatEdrNetworkConfigAccounts(

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

@@ -49,6 +49,7 @@ import {
   writeJsonFile,
   writeJsonFileAsStream,
   writeUtf8File,
+  readdirOrEmpty,
 } from "@nomicfoundation/hardhat-utils/fs";
 import { shortenPath } from "@nomicfoundation/hardhat-utils/path";
 import { createSpinner } from "@nomicfoundation/hardhat-utils/spinner";
@@ -176,23 +177,15 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     options: { scope?: BuildScope } = {},
   ): Promise<string[]> {
     const scope = options.scope ?? "contracts";
-    const unified = !this.#options.solidityConfig.splitTestsCompilation;
 
     this.#ensureSplitCompilationModeIfTestsScope(scope);
 
+    const unified = !this.#options.solidityConfig.splitTestsCompilation;
+    const { localContractFiles, sourceTestFiles } =
+      await this.#getSoliditySourcesRootFilePaths();
+
     switch (scope) {
       case "contracts": {
-        const localContractFiles = (
-          await Promise.all(
-            this.#options.soliditySourcesPaths.map((dir) =>
-              getAllFilesMatching(
-                dir,
-                (f) => f.endsWith(".sol") && !f.endsWith(".t.sol"),
-              ),
-            ),
-          )
-        ).flat(1);
-
         const npmFilesToBuild =
           this.#options.solidityConfig.npmFilesToBuild.map(
             npmModuleToNpmRootPath,
@@ -204,18 +197,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
 
         // In unified mode, contracts scope returns all roots: contracts,
         // tests, and npm files.
-        const testFiles = (
-          await Promise.all([
-            getAllFilesMatching(this.#options.solidityTestsPath, (f) =>
-              f.endsWith(".sol"),
-            ),
-            ...this.#options.soliditySourcesPaths.map(async (dir) => {
-              return await getAllFilesMatching(dir, (f) =>
-                f.endsWith(".t.sol"),
-              );
-            }),
-          ])
-        ).flat(1);
+        const testFiles = [
+          ...(await getAllFilesMatching(this.#options.solidityTestsPath, (f) =>
+            f.endsWith(".sol"),
+          )),
+          ...sourceTestFiles,
+        ];
 
         // Remove duplicates in case there is an intersection between
         // the tests.solidity paths and the sources paths
@@ -224,18 +211,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
         );
       }
       case "tests": {
-        let rootFilePaths = (
-          await Promise.all([
-            getAllFilesMatching(this.#options.solidityTestsPath, (f) =>
-              f.endsWith(".sol"),
-            ),
-            ...this.#options.soliditySourcesPaths.map(async (dir) => {
-              return await getAllFilesMatching(dir, (f) =>
-                f.endsWith(".t.sol"),
-              );
-            }),
-          ])
-        ).flat(1);
+        let rootFilePaths = [
+          ...(await getAllFilesMatching(this.#options.solidityTestsPath, (f) =>
+            f.endsWith(".sol"),
+          )),
+          ...sourceTestFiles,
+        ];
 
         // NOTE: We remove duplicates in case there is an intersection between
         // the tests.solidity paths and the sources paths
@@ -245,6 +226,46 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     }
   }
 
+  /**
+   * Returns all the root files from the different solidity source dirs in the
+   * config, partitioned into contract files and test files according to their
+   * extensions.
+   */
+  async #getSoliditySourcesRootFilePaths(): Promise<{
+    localContractFiles: string[];
+    sourceTestFiles: string[];
+  }> {
+    const sourceFileGroups = await Promise.all(
+      this.#options.soliditySourcesPaths.map(async (dir) => {
+        const localSolidityFiles = await getAllFilesMatching(dir, (f) =>
+          f.endsWith(".sol"),
+        );
+
+        const localContractFiles: string[] = [];
+        const sourceTestFiles: string[] = [];
+
+        for (const file of localSolidityFiles) {
+          if (file.endsWith(".t.sol")) {
+            sourceTestFiles.push(file);
+          } else {
+            localContractFiles.push(file);
+          }
+        }
+
+        return { localContractFiles, sourceTestFiles };
+      }),
+    );
+
+    return {
+      localContractFiles: sourceFileGroups.flatMap(
+        ({ localContractFiles }) => localContractFiles,
+      ),
+      sourceTestFiles: sourceFileGroups.flatMap(
+        ({ sourceTestFiles }) => sourceTestFiles,
+      ),
+    };
+  }
+
   public isSuccessfulBuildResult(
     buildResult: CompilationJobCreationError | Map<string, FileBuildResult>,
   ): buildResult is Map<string, FileBuildResult> {
@@ -1102,18 +1123,23 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       reachableBuildInfoIds.filter((id) => id !== undefined),
     );
 
-    // Get all the reachable build info files
-    const buildInfoFiles = await getAllFilesMatching(buildInfosDir, (f) =>
-      f.startsWith(buildInfosDir + path.sep),
-    );
+    // The build-info directory is expected to be flat: every build-info file
+    // lives directly under it, so a non-recursive `readdir` is enough.
+    const buildInfoFiles = await readdirOrEmpty(buildInfosDir);
 
     for (const buildInfoFile of buildInfoFiles) {
-      const basename = path.basename(buildInfoFile);
+      let id: string | undefined;
 
-      const id = basename.substring(0, basename.indexOf("."));
+      if (buildInfoFile.endsWith(".output.json")) {
+        id = buildInfoFile.slice(0, -".output.json".length);
+      } else if (buildInfoFile.endsWith(".json")) {
+        id = buildInfoFile.slice(0, -".json".length);
+      } else {
+        continue;
+      }
 
       if (!reachableBuildInfoIdsSet.has(id)) {
-        await remove(buildInfoFile);
+        await remove(path.join(buildInfosDir, buildInfoFile));
       }
     }
 

package/src/internal/builtin-plugins/solidity/hook-handlers/hre.ts

@@ -21,7 +21,14 @@ import type {
   CompilerOutputError,
 } from "../../../../types/solidity/compiler-io.js";
 import type { SolidityBuildInfo } from "../../../../types/solidity.js";
-import type { SolidityBuildSystemOptions } from "../build-system/build-system.js";
+import type {
+  SolidityBuildSystemOptions,
+  SolidityBuildSystemImplementation as SolidityBuildSystemImplementationT,
+} from "../build-system/build-system.js";
+
+let SolidityBuildSystemImplementation:
+  | typeof SolidityBuildSystemImplementationT
+  | undefined;
 
 class LazySolidityBuildSystem implements SolidityBuildSystem {
   readonly #hooks: HookManager;
@@ -126,9 +133,11 @@ class LazySolidityBuildSystem implements SolidityBuildSystem {
   }
 
   async #getBuildSystem(): Promise<SolidityBuildSystem> {
-    const { SolidityBuildSystemImplementation } = await import(
-      "../build-system/build-system.js"
-    );
+    if (SolidityBuildSystemImplementation === undefined) {
+      const buildSystemModule = await import("../build-system/build-system.js");
+      SolidityBuildSystemImplementation =
+        buildSystemModule.SolidityBuildSystemImplementation;
+    }
 
     if (this.#buildSystem === undefined) {
       this.#buildSystem = new SolidityBuildSystemImplementation(

package/src/internal/builtin-plugins/solidity-test/task-action.ts

@@ -27,7 +27,7 @@ import { getFullyQualifiedName } from "../../../utils/contract-names.js";
 import { errorResult, successfulResult } from "../../../utils/result.js";
 import { isSupportedChainType } from "../../edr/chain-type.js";
 import { ArtifactManagerImplementation } from "../artifacts/artifact-manager.js";
-import { getCoverageManager } from "../coverage/helpers.js";
+import { getCoverageManager } from "../coverage/helpers/accessors.js";
 import { getGasAnalyticsManager } from "../gas-analytics/helpers/accessors.js";
 import { edrGasReportToHardhatGasMeasurements } from "../network-manager/edr/utils/convert-to-edr.js";
 

package/src/internal/builtin-plugins/test/task-action.ts

@@ -16,7 +16,7 @@ import {
   isResult,
   successfulResult,
 } from "../../../utils/result.js";
-import { getCoverageManager } from "../coverage/helpers.js";
+import { getCoverageManager } from "../coverage/helpers/accessors.js";
 import { getGasAnalyticsManager } from "../gas-analytics/helpers/accessors.js";
 
 interface TestActionArguments {