hardhat 3.4.0 → 3.4.2

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/sentry/reporter.js";
+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 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">;
@@ -325,7 +266,7 @@ export class EdrProvider extends BaseProvider {
         typeof jsonRpcResponse.result === "string",
         "Invalid client version response",
       );
-      return clientVersion(jsonRpcResponse.result);
+      return await clientVersion(jsonRpcResponse.result);
     } else {
       return jsonRpcResponse.result;
     }
@@ -496,7 +437,7 @@ export class EdrProvider extends BaseProvider {
       throw new UnknownError(error.message, error);
     }
 
-    return this.#handleEdrResponse(
+    return await this.#handleEdrResponse(
       edrResponse,
       request.method,
       Array.isArray(request.params) ? request.params : undefined,

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

@@ -79,7 +79,7 @@ export async function getGenesisStateAndOwnedAccounts(
     return cached;
   }
 
-  return genesisStateAndAccountsCacheMutex.exclusiveRun(async () => {
+  return await genesisStateAndAccountsCacheMutex.exclusiveRun(async () => {
     // We need to check again inside the mutex callback in case another async
     // operation initialized it while we were waiting to acquire the mutex
     const cachedAfterWaiting = genesisStateAndAccountsCache

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";
@@ -281,7 +281,7 @@ export async function hardhatAccountsToEdrOwnedAccounts(
     balance: account.balance,
   }));
 
-  return Promise.all(accountPromises);
+  return await Promise.all(accountPromises);
 }
 
 export async function normalizeEdrNetworkAccountsConfig(

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

@@ -17,7 +17,7 @@ export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
           networkManager = await createNetworkManager(hre, context);
         }
 
-        return networkManager.create(networkConnectionParams);
+        return await networkManager.create(networkConnectionParams);
       },
 
       async connect(networkConnectionParams) {
@@ -25,7 +25,7 @@ export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
           networkManager = await createNetworkManager(hre, context);
         }
 
-        return networkManager.connect(networkConnectionParams);
+        return await networkManager.connect(networkConnectionParams);
       },
 
       async getOrCreate(networkOrParams) {
@@ -33,7 +33,7 @@ export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
           networkManager = await createNetworkManager(hre, context);
         }
 
-        return networkManager.getOrCreate(networkOrParams);
+        return await networkManager.getOrCreate(networkOrParams);
       },
 
       async createServer(...params) {
@@ -41,7 +41,7 @@ export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => ({
           networkManager = await createNetworkManager(hre, context);
         }
 
-        return networkManager.createServer(...params);
+        return await networkManager.createServer(...params);
       },
     };
 

package/src/internal/builtin-plugins/network-manager/hook-handlers/network.ts

@@ -78,7 +78,7 @@ export default async (): Promise<Partial<NetworkHooks>> => {
         updatedRequest = newRequestOrResponse;
       }
 
-      return next(context, networkConnection, updatedRequest);
+      return await next(context, networkConnection, updatedRequest);
     },
 
     async closeConnection<ChainTypeT extends ChainType | string>(
@@ -93,7 +93,7 @@ export default async (): Promise<Partial<NetworkHooks>> => {
         requestHandlersPerConnection.delete(networkConnection);
       }
 
-      return next(context, networkConnection);
+      return await next(context, networkConnection);
     },
   };
 

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

@@ -224,7 +224,11 @@ export class HttpProvider extends BaseProvider {
           retryCount,
         );
         if (this.#shouldRetryRequest(retryAfterSeconds, retryCount)) {
-          return this.#retry(jsonRpcRequest, retryAfterSeconds, retryCount);
+          return await this.#retry(
+            jsonRpcRequest,
+            retryAfterSeconds,
+            retryCount,
+          );
         }
 
         // eslint-disable-next-line no-restricted-syntax -- allow throwing ProviderError
@@ -269,7 +273,7 @@ export class HttpProvider extends BaseProvider {
     retryCount: number,
   ) {
     await sleep(retryAfterSeconds);
-    return this.#fetchJsonRpcResponse(request, retryCount + 1);
+    return await this.#fetchJsonRpcResponse(request, retryCount + 1);
   }
 }
 

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

@@ -116,7 +116,11 @@ export class NetworkManagerImplementation implements NetworkManager {
       "newConnection",
       [],
       async (_context) =>
-        this.#initializeNetworkConnection(networkName, chainType, override),
+        await this.#initializeNetworkConnection(
+          networkName,
+          chainType,
+          override,
+        ),
     );
 
     /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -131,7 +135,7 @@ export class NetworkManagerImplementation implements NetworkManager {
   ): Promise<NetworkConnection<ChainTypeT>> {
     this.#connectCalled = true;
 
-    return this.create(networkOrParams);
+    return await this.create(networkOrParams);
   }
 
   public async getOrCreate<
@@ -170,7 +174,7 @@ export class NetworkManagerImplementation implements NetworkManager {
       return cached as NetworkConnection<ChainTypeT>;
     }
 
-    return this.#getOrCreateMutex.exclusiveRun(async () => {
+    return await this.#getOrCreateMutex.exclusiveRun(async () => {
       // Double-check after acquiring the mutex — another call may have
       // populated the cache while we were waiting.
       const cachedAfterWaiting = this.#getOrCreateCache
@@ -260,7 +264,7 @@ export class NetworkManagerImplementation implements NetworkManager {
           "network",
           "onRequest",
           [networkConnection, request],
-          async (_context, _connection, req) => defaultBehavior(req),
+          async (_context, _connection, req) => await defaultBehavior(req),
         );
 
       if (resolvedNetworkConfig.type === "edr-simulated") {
@@ -351,7 +355,7 @@ export class NetworkManagerImplementation implements NetworkManager {
 
         const includeCallTraces = verbosityToIncludeTraces(this.#verbosity);
 
-        return EdrProvider.create({
+        return await EdrProvider.create({
           chainDescriptors: this.#chainDescriptors,
           // The resolvedNetworkConfig can have its chainType set to `undefined`
           // so we default to the default chain type here.
@@ -375,7 +379,7 @@ export class NetworkManagerImplementation implements NetworkManager {
         });
       }
 
-      return HttpProvider.create({
+      return await HttpProvider.create({
         url: await resolvedNetworkConfig.url.getUrl(),
         networkName: resolvedNetworkName,
         extraHeaders: resolvedNetworkConfig.httpHeaders,
@@ -384,7 +388,7 @@ export class NetworkManagerImplementation implements NetworkManager {
       });
     };
 
-    return NetworkConnectionImplementation.create(
+    return await NetworkConnectionImplementation.create(
       this.#nextConnectionId++,
       resolvedNetworkName,
       resolvedChainType,

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

@@ -16,8 +16,8 @@ import chalk from "chalk";
 // micro-eth-signer is known to be slow to load, so we lazy load it
 let microEthSigner: typeof MicroEthSignerT | undefined;
 
-import { sendErrorTelemetry } from "../../cli/telemetry/sentry/reporter.js";
-import { isDefaultEdrNetworkHDAccountsConfig } from "../network-manager/edr/edr-provider.js";
+import { sendErrorTelemetry } from "../../cli/telemetry/error-reporter/reporter.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/node/index.ts

@@ -46,7 +46,7 @@ const hardhatPlugin: HardhatPlugin = {
         type: ArgumentType.INT,
         defaultValue: -1,
       })
-      .setAction(async () => import("./task-action.js"))
+      .setAction(async () => await import("./task-action.js"))
       .build(),
   ],
   dependencies: () => [import("../network-manager/index.js")],

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

@@ -14,7 +14,7 @@ const hardhatPlugin: HardhatPlugin = {
         name: "noCompile",
         description: "Do not compile the project before running the script",
       })
-      .setAction(async () => import("./task-action.js"))
+      .setAction(async () => await import("./task-action.js"))
       .build(),
   ],
   dependencies: () => [import("../solidity/index.js")],

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,16 +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 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
@@ -222,16 +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 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
@@ -241,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> {
@@ -253,12 +278,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
   ): Promise<CompilationJobCreationError | Map<string, FileBuildResult>> {
     this.#ensureSplitCompilationModeIfTestsScope(options?.scope);
 
-    return this.#hooks.runHandlerChain(
+    return await this.#hooks.runHandlerChain(
       "solidity",
       "build",
       [rootFilePaths, options],
       async (_context, nextRootFilePaths, nextOptions) =>
-        this.#build(nextRootFilePaths, nextOptions),
+        await this.#build(nextRootFilePaths, nextOptions),
     );
   }
 
@@ -308,8 +333,9 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       // NOTE: We precompute the build ids in parallel here, which are cached
       // internally in each compilation job
       await Promise.all(
-        runnableCompilationJobs.map(async (runnableCompilationJob) =>
-          runnableCompilationJob.getBuildId(),
+        runnableCompilationJobs.map(
+          async (runnableCompilationJob) =>
+            await runnableCompilationJob.getBuildId(),
         ),
       );
 
@@ -539,7 +565,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
           "getCompiler",
           [compilerConfig],
           async (_context, cfg) =>
-            getSolcCompilerForConfig(cfg, buildProfile.preferWasm),
+            await getSolcCompilerForConfig(cfg, buildProfile.preferWasm),
         );
         longVersion = compiler.longVersion;
         longVersionMap.set(compilerConfig.version, longVersion);
@@ -805,7 +831,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       "getCompiler",
       [runnableCompilationJob.solcConfig],
       async (_context, cfg) =>
-        getSolcCompilerForConfig(cfg, buildProfile.preferWasm),
+        await getSolcCompilerForConfig(cfg, buildProfile.preferWasm),
     );
 
     log(
@@ -824,7 +850,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       "invokeSolc",
       [compiler, input, runnableCompilationJob.solcConfig],
       async (_context, nextCompiler, nextSolcInput) => {
-        return nextCompiler.compile(nextSolcInput);
+        return await nextCompiler.compile(nextSolcInput);
       },
     );
 
@@ -1097,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));
       }
     }
 
@@ -1165,7 +1196,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       preferWasm: false,
     });
 
-    return compiler.compile(buildInfo.input);
+    return await compiler.compile(buildInfo.input);
   }
 
   async #downloadConfiguredCompilers(quiet = false): Promise<void> {
@@ -1200,8 +1231,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     );
   }
 
+  #isFatalError(error: CompilerOutputError): boolean {
+    return error.type !== "Warning" && error.severity === "error";
+  }
+
   #hasCompilationErrors(output: CompilerOutput): boolean {
-    return output.errors?.some((x: any) => x.severity === "error") ?? false;
+    return output.errors?.some((e) => this.#isFatalError(e)) ?? false;
   }
 
   /**
@@ -1314,7 +1349,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     console.log();
 
     for (const error of filteredErrors) {
-      if (error.severity === "error") {
+      if (this.#isFatalError(error)) {
         const errorMessage: string =
           this.#getFormattedInternalCompilerErrorMessage(error) ??
           error.formattedMessage ??

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

@@ -92,7 +92,7 @@ export class CompilationJobImplementation implements CompilationJob {
         // instrument the project file content when coverage feature is enabled.
         // We pass some additional data via the chain - i.e. the input source name and solc
         // version - but we expect any handlers to pass them on as-is without modification.
-        return this.#hooks.runHandlerChain(
+        return await this.#hooks.runHandlerChain(
           "solidity",
           "preprocessProjectFileBeforeBuilding",
           [file.inputSourceName, file.fsPath, file.content.text, solcVersion],