hardhat 3.2.0 → 3.4.0

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

@@ -1,54 +1,232 @@
-import type { SolcConfig } from "../../../types/config.js";
+import type { SolidityCompilerConfig } from "../../../types/config.js";
 import type { BuildOptions, CompilationJobCreationError, FileBuildResult, SolidityBuildSystem } from "../../../types/solidity/build-system.js";
 import type { Compiler, CompilerInput, CompilerOutput } from "../../../types/solidity.js";
 import "../../../types/config.js";
 declare module "../../../types/config.js" {
+    /**
+     * An interface with a key per compiler type.
+     * The types of the values don't matter; we use `true` as a convention.
+     *
+     * By default, only "solc" is provided. Plugins can extend this via
+     * declaration merging to add new compiler types (e.g. "solx").
+     */
+    interface SolidityCompilerTypeDefinitions {
+        solc: true;
+    }
+    /**
+     * The different Solidity compiler types, derived from
+     * SolidityCompilerTypeDefinitions. Extensible via declaration merging.
+     */
+    type SolidityCompilerType = keyof SolidityCompilerTypeDefinitions;
+    /**
+     * The type of `userConfig.solidity`.
+     */
     type SolidityUserConfig = string | string[] | SingleVersionSolidityUserConfig | MultiVersionSolidityUserConfig | BuildProfilesSolidityUserConfig;
-    interface SolcUserConfig {
+    /**
+     * Fields that all the object-typed variants of SolidityUserConfig share.
+     *
+     * Note: All the variants of SolidityUserConfig except for the string and
+     * array of strings MUST extend this interface. For plugins creating their
+     * own `SingleVersionSolidityUserConfig` variant, see
+     * {@link CommonSingleVersionSolidityUserConfig}.
+     */
+    interface CommonSolidityUserConfig {
+        isolated?: boolean;
+        npmFilesToBuild?: string[];
+        /**
+         * Controls whether Solidity test files are compiled in a separate pass
+         * from contract files.
+         *
+         * When `false` (the default), contracts and tests are compiled together
+         * in a single pass.
+         *
+         * When `true`, contracts and tests are compiled separately.
+         */
+        splitTestsCompilation?: boolean;
+    }
+    /**
+     * Common fields for every SingleVersionSolidityUserConfig variant.
+     *
+     * NOTE: All the variants of SingleVersionSolidityUserConfig must extend this
+     * interface.
+     */
+    interface CommonSingleVersionSolidityUserConfig extends CommonSolidityUserConfig {
+        toolVersionsInBuildInfo?: boolean;
+    }
+    /**
+     * Fields that all the SolidityCompilerUserConfig variants share.
+     *
+     * Note: All the types of SolidityCompilerUserConfig MUST extend this
+     * interface. This is especially relevant for plugins creating their own
+     * `SolidityCompilerUserConfig` variant.
+     */
+    interface CommonSolidityCompilerUserConfig {
+        type?: SolidityCompilerType;
         version: string;
         settings?: any;
         path?: string;
-        preferWasm?: boolean;
     }
-    interface SingleVersionSolcUserConfig extends SolcUserConfig {
-        isolated?: boolean;
+    /**
+     * Deprecated: Use `SolcSolidityCompilerUserConfig` instead.
+     * @deprecated
+     */
+    interface SolcUserConfig extends CommonSolidityCompilerUserConfig {
+        type?: "solc";
         preferWasm?: boolean;
     }
-    interface MultiVersionSolcUserConfig {
-        isolated?: boolean;
-        preferWasm?: boolean;
-        compilers: SolcUserConfig[];
-        overrides?: Record<string, SolcUserConfig>;
+    /**
+     * Solc-specific SolidityCompilerUserConfig.
+     */
+    interface SolcSolidityCompilerUserConfig extends SolcUserConfig {
     }
-    interface CommonSolidityUserConfig {
-        npmFilesToBuild?: string[];
+    /**
+     * A map from compiler type to its SolidityCompilerUserConfig type.
+     *
+     * Note: The types MUST extend `CommonSolidityCompilerUserConfig`.
+     */
+    interface SolidityCompilerUserConfigPerType {
+        solc: SolcSolidityCompilerUserConfig;
+    }
+    /**
+     * The type of all the compiler user configs.
+     */
+    type SolidityCompilerUserConfig = {
+        [type in keyof SolidityCompilerUserConfigPerType]: SolidityCompilerUserConfigPerType[type];
+    }[keyof SolidityCompilerUserConfigPerType] | (Omit<SolcSolidityCompilerUserConfig, "type"> & Partial<Pick<SolcSolidityCompilerUserConfig, "type">>);
+    /**
+     * Deprecated: Use `SolcSingleVersionSolidityUserConfig` instead.
+     * @deprecated
+     */
+    interface SingleVersionSolcUserConfig extends SolcSolidityCompilerUserConfig, CommonSingleVersionSolidityUserConfig {
+    }
+    /**
+     * Solc-specific SingleVersionSolidityUserConfig.
+     */
+    interface SolcSingleVersionSolidityUserConfig extends SingleVersionSolcUserConfig {
     }
-    interface SingleVersionSolidityUserConfig extends SingleVersionSolcUserConfig, CommonSolidityUserConfig {
+    /**
+     * A map from compiler type to its SingleVersionSolidityUserConfig type.
+     *
+     * Note: The types MUST extend `CommonSingleVersionSolidityUserConfig`.
+     */
+    interface SingleVersionSolidityUserConfigPerType {
+        solc: SolcSingleVersionSolidityUserConfig;
     }
+    /**
+     * The type of all the single version user configs.
+     */
+    type SingleVersionSolidityUserConfig = {
+        [type in keyof SingleVersionSolidityUserConfigPerType]: SingleVersionSolidityUserConfigPerType[type];
+    }[keyof SingleVersionSolidityUserConfigPerType] | (Omit<SolcSingleVersionSolidityUserConfig, "type"> & Partial<Pick<SolcSingleVersionSolidityUserConfig, "type">>);
+    /**
+     * Deprecated: Use `MultiVersionSolidityUserConfig` or
+     * `MultiVersionBuildProfileUserConfig` instead.
+     * @deprecated
+     */
+    interface MultiVersionSolcUserConfig {
+        preferWasm?: boolean;
+        isolated?: boolean;
+        compilers: SolidityCompilerUserConfig[];
+        overrides?: Record<string, SolidityCompilerUserConfig>;
+    }
+    /**
+     * The type of a multi-version SolidityUserConfig.
+     *
+     * Partially defined in `MultiVersionSolcUserConfig` for backwards
+     * compatibility.
+     */
     interface MultiVersionSolidityUserConfig extends MultiVersionSolcUserConfig, CommonSolidityUserConfig {
+        toolVersionsInBuildInfo?: boolean;
+    }
+    /**
+     * The type of a single-version build profile user config.
+     */
+    type SingleVersionBuildProfileUserConfig = SolidityCompilerUserConfig & {
+        isolated?: boolean;
+        toolVersionsInBuildInfo?: boolean;
+    };
+    /**
+     * The type of a multi-version build profile user config.
+     * Mostly defined in `MultiVersionSolcUserConfig` for backwards compatibility
+     */
+    interface MultiVersionBuildProfileUserConfig extends MultiVersionSolcUserConfig {
+        toolVersionsInBuildInfo?: boolean;
     }
+    /**
+     * The type of the build profile version of the SolidityUserConfig.
+     */
     interface BuildProfilesSolidityUserConfig extends CommonSolidityUserConfig {
-        profiles: Record<string, SingleVersionSolcUserConfig | MultiVersionSolcUserConfig>;
+        profiles: Record<string, SingleVersionBuildProfileUserConfig | MultiVersionBuildProfileUserConfig>;
     }
+    /**
+     * Extension of HardhatUserConfig with the `solidity` property.
+     */
     interface HardhatUserConfig {
         solidity?: SolidityUserConfig;
     }
-    interface SolcConfig {
+    /**
+     * Common fields of a SolidityCompilerConfig.
+     *
+     * Note: All the types of SolidityCompiler config MUST extend this interface.
+     * This is especially relevant for plugins creating their own
+     * `SolidityCompilerConfig` variant.
+     */
+    interface CommonSolidityCompilerConfig {
+        type?: SolidityCompilerType;
         version: string;
         settings: any;
         path?: string;
+    }
+    /**
+     * Deprecated: Use `SolcSolidityCompilerConfig` instead.
+     * @deprecated
+     */
+    interface SolcConfig extends CommonSolidityCompilerConfig {
+        type?: "solc";
         preferWasm?: boolean;
     }
+    /**
+     * The type of a solc-specific SolidityCompilerConfig.
+     */
+    interface SolcSolidityCompilerConfig extends SolcConfig {
+    }
+    /**
+     * A map from compiler type to its `SolidityCompilerConfig` type. Note that
+     * the types MUST extend `CommonSolidityCompilerConfig`.
+     */
+    interface SolidityCompilerConfigPerType {
+        solc: SolcSolidityCompilerConfig;
+    }
+    /**
+     * The type of all the compiler configs.
+     */
+    type SolidityCompilerConfig = {
+        [type in keyof SolidityCompilerConfigPerType]: SolidityCompilerConfigPerType[type] & {
+            type: type;
+        };
+    }[keyof SolidityCompilerConfigPerType] | (Omit<SolcSolidityCompilerConfig, "type"> & Partial<Pick<SolcSolidityCompilerConfig, "type">>);
+    /**
+     * The type of a resolved build profile config.
+     */
     interface SolidityBuildProfileConfig {
         isolated: boolean;
         preferWasm: boolean;
-        compilers: SolcConfig[];
-        overrides: Record<string, SolcConfig>;
+        toolVersionsInBuildInfo?: boolean;
+        compilers: SolidityCompilerConfig[];
+        overrides: Record<string, SolidityCompilerConfig>;
     }
+    /**
+     * Resolved Solidity config.
+     */
     interface SolidityConfig {
         profiles: Record<string, SolidityBuildProfileConfig>;
         npmFilesToBuild: string[];
+        registeredCompilerTypes: SolidityCompilerType[];
+        splitTestsCompilation: boolean;
     }
+    /**
+     * An extension of HardhatConfig with the `solidity` property.
+     */
     interface HardhatConfig {
         solidity: SolidityConfig;
     }
@@ -77,6 +255,27 @@ declare module "../../../types/hooks.js" {
         solidity: SolidityHooks;
     }
     interface SolidityHooks {
+        /**
+         * Hook triggered to download compilers needed for compilation.
+         * Each handler should download compilers it is responsible for.
+         * Runs in parallel — all registered handlers execute concurrently.
+         *
+         * @param context The hook context.
+         * @param compilerConfigs All compiler configurations from all build profiles.
+         * @param quiet Whether to suppress download progress output.
+         */
+        downloadCompilers: (context: HookContext, compilerConfigs: SolidityCompilerConfig[], quiet: boolean) => Promise<void>;
+        /**
+         * Hook to obtain a Compiler instance for a given compiler configuration.
+         * The default handler returns a solc compiler. Plugins can intercept to
+         * return their own compiler (e.g. SolxCompiler for type: "solx").
+         *
+         * @param context The hook context.
+         * @param compilerConfig The compiler configuration to get a compiler for.
+         * @param next A function to call the next handler for this hook.
+         * @returns A Compiler instance.
+         */
+        getCompiler: (context: HookContext, compilerConfig: SolidityCompilerConfig, next: (nextContext: HookContext, nextCompilerConfig: SolidityCompilerConfig) => Promise<Compiler>) => Promise<Compiler>;
         /**
          * Hook triggered during the cleanup process of Solidity compilation artifacts.
          * This hook runs after unused artifacts and build-info files have been removed.
@@ -105,7 +304,7 @@ declare module "../../../types/hooks.js" {
          */
         preprocessProjectFileBeforeBuilding(context: HookContext, inputSourceName: string, fsPath: string, fileContent: string, solcVersion: string, next: (nextContext: HookContext, nextInputSourceName: string, nextFsPath: string, nextFileContent: string, nextSolcVersion: string) => Promise<string>): Promise<string>;
         /**
-         * Hook triggered within the compilation job when its' solc input is first constructed.
+         * Hook triggered within the compilation job when its solc input is first constructed.
          *
          * @param context The hook context.
          * @param solcInput The solc input that will be passed to solc.
@@ -128,22 +327,22 @@ declare module "../../../types/hooks.js" {
          */
         build: (context: HookContext, rootFilePaths: string[], options: BuildOptions | undefined, next: (nextContext: HookContext, nextRootFilePaths: string[], nextOptions: BuildOptions | undefined) => Promise<CompilationJobCreationError | Map<string, FileBuildResult>>) => Promise<CompilationJobCreationError | Map<string, FileBuildResult>>;
         /**
-         * Hook triggered to invoke a passed in Solc compiler on the
-         * Solc input generated for a given compilation job.
-         * This hook allows for manipulating the Solc input passed into the Solc
-         * compiler Hardhat has selected for the compilation job, and similarly to
-         * manipulate the Solc output.
+         * Hook triggered to invoke a compiler on the standard-json input
+         * generated for a given compilation job.
+         * This hook allows for manipulating the input passed into the compiler
+         * Hardhat has selected for the compilation job, and similarly to
+         * manipulate the output.
          *
          * @param context The hook context.
-         * @param compile The Solc compiler selected by Hardhat for this compilation
-         * job.
-         * @param solcInput The solc input json constructed from the compilation
+         * @param compiler The compiler selected by Hardhat for this compilation
          * job.
-         * @param solcConfig The configuration used to setup solc e.g. version.
+         * @param solcInput The standard-json input constructed from the
+         * compilation job.
+         * @param solcConfig The compiler configuration (version, type, etc.).
          * @param next A function to call the next handler for this hook, or the
          * default implementation if no more handlers exist.
          */
-        invokeSolc(context: HookContext, compiler: Compiler, solcInput: CompilerInput, solcConfig: SolcConfig, next: (nextContext: HookContext, nextCompiler: Compiler, nextSolcInput: CompilerInput, nextSolcConfig: SolcConfig) => Promise<CompilerOutput>): Promise<CompilerOutput>;
+        invokeSolc(context: HookContext, compiler: Compiler, solcInput: CompilerInput, solcConfig: SolidityCompilerConfig, next: (nextContext: HookContext, nextCompiler: Compiler, nextSolcInput: CompilerInput, nextSolcConfig: SolidityCompilerConfig) => Promise<CompilerOutput>): Promise<CompilerOutput>;
         /**
          * Provide a handler for this hook to supply remappings for npm packages.
          *

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

@@ -1 +1 @@
-{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity/type-extensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-extensions.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":"AAaA,OAAO,0BAA0B,CAAC;AAoFlC,OAAO,uBAAuB,CAAC;AAO/B,OAAO,kCAAkC,CAAC;AAO1C,OAAO,yBAAyB,CAAC"}
+{"version":3,"file":"type-extensions.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity/type-extensions.ts"],"names":[],"mappings":"AAaA,OAAO,0BAA0B,CAAC;AAmTlC,OAAO,uBAAuB,CAAC;AAO/B,OAAO,kCAAkC,CAAC;AAO1C,OAAO,yBAAyB,CAAC"}

package/dist/src/internal/builtin-plugins/solidity-test/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAehC,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AA+EvE,wBAAgB,gCAAgC,CAC9C,iBAAiB,EAAE,sBAAsB,CAAC,SAAS,CAAC,EACpD,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,GAAG,SAAS,CAqBvC;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,OAAO,GAClB,gCAAgC,EAAE,CAEpC;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,aAAa,EAC7B,4BAA4B,EAAE,6BAA6B,GAC1D,OAAO,CAAC,aAAa,CAAC,CAmCxB;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,GAAE,sBAAsB,CAAC,MAAM,CAAM,GAClD,kBAAkB,CAAC,MAAM,CAAC,CAK5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EACV,6BAA6B,EAC7B,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAgBhC,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AAmFvE,wBAAgB,gCAAgC,CAC9C,iBAAiB,EAAE,sBAAsB,CAAC,SAAS,CAAC,EACpD,4BAA4B,EAAE,6BAA6B,GAC1D,yBAAyB,GAAG,SAAS,CAyBvC;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,OAAO,GAClB,gCAAgC,EAAE,CAEpC;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,aAAa,EAC7B,4BAA4B,EAAE,6BAA6B,GAC1D,OAAO,CAAC,aAAa,CAAC,CAmCxB;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,GAAE,sBAAsB,CAAC,MAAM,CAAM,GAClD,kBAAkB,CAAC,MAAM,CAAC,CAK5B"}

package/dist/src/internal/builtin-plugins/solidity-test/config.js

@@ -1,12 +1,11 @@
 import path from "node:path";
 import { isObject } from "@nomicfoundation/hardhat-utils/lang";
 import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
-import { conditionalUnionType, sensitiveStringSchema, sensitiveUrlSchema, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
+import { conditionalUnionType, sensitiveStringSchema, sensitiveUrlSchema, unionType, validateUserConfigZodType, } from "@nomicfoundation/hardhat-zod-utils";
 import { z } from "zod";
 // the keccak256 of "built for ethereum"
 export const DEFAULT_FUZZ_SEED = "0x7727ea51af0441c20da14dcd68a15dac8c9ebd589c5be8fa8c87c1d3720450bc";
 const solidityTestUserConfigType = z.object({
-    timeout: z.number().optional(),
     fsPermissions: z
         .object({
         readWriteFile: z.array(z.string()).optional(),
@@ -44,7 +43,7 @@ const solidityTestUserConfigType = z.object({
     forking: z
         .object({
         url: z.optional(sensitiveUrlSchema),
-        blockNumber: z.bigint().optional(),
+        blockNumber: z.optional(unionType([z.number().int().nonnegative().safe(), z.bigint().nonnegative()], "Expected a nonnegative safe int or a nonnegative bigint")),
         rpcEndpoints: z.record(sensitiveStringSchema).optional(),
     })
         .optional(),
@@ -89,6 +88,9 @@ export function resolveSolidityTestForkingConfig(forkingUserConfig, resolveConfi
     }
     return {
         ...forkingUserConfig,
+        blockNumber: forkingUserConfig.blockNumber !== undefined
+            ? BigInt(forkingUserConfig.blockNumber)
+            : undefined,
         url: forkingUserConfig.url !== undefined
             ? resolveConfigurationVariable(forkingUserConfig.url)
             : undefined,

package/dist/src/internal/builtin-plugins/solidity-test/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/config.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.d.ts

@@ -1,20 +1,26 @@
 import type { ArtifactManager } from "../../../types/artifacts.js";
-import type { BuildInfoAndOutput, Artifact as EdrArtifact } from "@nomicfoundation/edr";
+import type { BuildInfoAndOutput as EdrBuildInfoAndOutput, Artifact as EdrArtifact } from "@nomicfoundation/edr";
+export interface BuildInfoAndOutput extends EdrBuildInfoAndOutput {
+    buildInfoId: string;
+}
+export interface EdrArtifactWithMetadata {
+    edrArtifact: EdrArtifact;
+    userSourceName: string;
+    buildInfoId: string;
+}
+export declare const BUILD_INFO_FORMAT: RegExp;
 /**
  * This function returns all the build infos and associated outputs.
  *
  * @param artifactManager The artifact manager.
  * @returns The build infos in the Hardhat v3 format as expected by the EDR.
  */
-export declare function getBuildInfos(artifactManager: ArtifactManager): Promise<BuildInfoAndOutput[]>;
+export declare function getBuildInfosAndOutputs(artifactManager: ArtifactManager): Promise<BuildInfoAndOutput[]>;
 /**
  * This function returns the artifacts generated during the compilation.
  *
  * @param artifactManager The artifact manager.
  * @returns The artifacts in the format expected by the EDR.
  */
-export declare function getEdrArtifacts(artifactManager: ArtifactManager): Promise<Array<{
-    edrArtifact: EdrArtifact;
-    userSourceName: string;
-}>>;
+export declare function buildEdrArtifactsWithMetadata(artifactManager: ArtifactManager): Promise<EdrArtifactWithMetadata[]>;
 //# sourceMappingURL=edr-artifacts.d.ts.map

package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edr-artifacts.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/edr-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,KAAK,EACV,kBAAkB,EAClB,QAAQ,IAAI,WAAW,EACxB,MAAM,sBAAsB,CAAC;AAQ9B;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAgC/B;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,KAAK,CAAC;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAuFtE"}
+{"version":3,"file":"edr-artifacts.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/edr-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,KAAK,EACV,kBAAkB,IAAI,qBAAqB,EAC3C,QAAQ,IAAI,WAAW,EACxB,MAAM,sBAAsB,CAAC;AAK9B,MAAM,WAAW,kBAAmB,SAAQ,qBAAqB;IAC/D,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,iBAAiB,EAAE,MAC4E,CAAC;AAE7G;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiC/B;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAwFpC"}

package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.js

@@ -1,17 +1,17 @@
 import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
 import { readBinaryFile } from "@nomicfoundation/hardhat-utils/fs";
-const BUILD_INFO_FORMAT = /^solc-(?<major>\d+)_(?<minor>\d+)_(?<patch>\d+)-[0-9a-fA-F]*$/;
+export const BUILD_INFO_FORMAT = /^solc-(?<major>\d+)_(?<minor>\d+)_(?<patch>\d+)(?:-(?<compilerType>[a-zA-Z][a-zA-Z0-9]*))?-[0-9a-fA-F]*$/;
 /**
  * This function returns all the build infos and associated outputs.
  *
  * @param artifactManager The artifact manager.
  * @returns The build infos in the Hardhat v3 format as expected by the EDR.
  */
-export async function getBuildInfos(artifactManager) {
-    const buildIds = await artifactManager.getAllBuildInfoIds();
-    return Promise.all(Array.from(buildIds).map(async (buildId) => {
-        const buildInfoPath = await artifactManager.getBuildInfoPath(buildId);
-        const buildInfoOutputPath = await artifactManager.getBuildInfoOutputPath(buildId);
+export async function getBuildInfosAndOutputs(artifactManager) {
+    const buildInfoIds = await artifactManager.getAllBuildInfoIds();
+    return Promise.all(Array.from(buildInfoIds).map(async (buildInfoId) => {
+        const buildInfoPath = await artifactManager.getBuildInfoPath(buildInfoId);
+        const buildInfoOutputPath = await artifactManager.getBuildInfoOutputPath(buildInfoId);
         // This is only safe because of how we currently interact with getBuildInfos
         // i.e. we call it immediately after a build which should ensure both
         // the build info and build info output exist. If the usage pattern of this
@@ -22,6 +22,7 @@ export async function getBuildInfos(artifactManager) {
         const buildInfo = await readBinaryFile(buildInfoPath);
         const output = await readBinaryFile(buildInfoOutputPath);
         return {
+            buildInfoId,
             buildInfo,
             output,
         };
@@ -33,7 +34,7 @@ export async function getBuildInfos(artifactManager) {
  * @param artifactManager The artifact manager.
  * @returns The artifacts in the format expected by the EDR.
  */
-export async function getEdrArtifacts(artifactManager) {
+export async function buildEdrArtifactsWithMetadata(artifactManager) {
     const fullyQualifiedNames = await artifactManager.getAllFullyQualifiedNames();
     const artifacts = await Promise.all(Array.from(fullyQualifiedNames).map(async (fullyQualifiedName) => {
         return artifactManager.readArtifact(fullyQualifiedName);
@@ -84,6 +85,7 @@ export async function getEdrArtifacts(artifactManager) {
                 contract,
             },
             userSourceName: artifact.sourceName,
+            buildInfoId: artifact.buildInfoId,
         };
     });
 }

package/dist/src/internal/builtin-plugins/solidity-test/edr-artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"edr-artifacts.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/edr-artifacts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edr-artifacts.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/edr-artifacts.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/builtin-plugins/solidity-test/formatters.d.ts

@@ -1,14 +1,3 @@
-import type { ArtifactId, CallTrace } from "@nomicfoundation/edr";
-export interface Colorizer {
-    blue: (text: string) => string;
-    green: (text: string) => string;
-    red: (text: string) => string;
-    cyan: (text: string) => string;
-    yellow: (text: string) => string;
-    grey: (text: string) => string;
-    dim: (text: string) => string;
-}
+import type { ArtifactId } from "@nomicfoundation/edr";
 export declare function formatArtifactId(artifactId: ArtifactId, sourceNameToUserSourceName: Map<string, string>): string;
-export declare function formatLogs(logs: string[], indent: number, colorizer: Colorizer): string;
-export declare function formatTraces(traces: CallTrace[], prefix: string, colorizer: Colorizer): string;
 //# sourceMappingURL=formatters.d.ts.map

package/dist/src/internal/builtin-plugins/solidity-test/formatters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/formatters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,SAAS,EAEV,MAAM,sBAAsB,CAAC;AAO9B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAChC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACjC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC/B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/B;AAID,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,MAAM,CAKR;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GACnB,MAAM,CAIR;AA2KD,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GACnB,MAAM,CAKR"}
+{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/solidity-test/formatters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,MAAM,CAKR"}