hardhat 3.2.0 → 3.4.0

package/dist/src/types/solidity/build-system.d.ts

@@ -37,7 +37,13 @@ export interface BuildOptions {
      */
     quiet?: boolean;
     /**
-     * Whether to compile contracts or tests. Defaults to contracts
+     * Whether to compile contracts or tests. Defaults to contracts.
+     *
+     * When `solidity.splitTestsCompilation` is `false` (the default), only
+     * `"contracts"` is accepted.
+     *
+     * When `solidity.splitTestsCompilation` is `true`, both scopes are valid
+     * and produce separate compilation passes.
      */
     scope?: BuildScope;
 }
@@ -212,6 +218,16 @@ export interface SolidityBuildSystem {
      * The root files are either absolute paths or
      * `npm:<package-name>/<file-path>` URIs.
      *
+     * When `solidity.splitTestsCompilation` is `false`, contracts and tests are
+     * compiled together and `scope: "contracts"` returns every build root:
+     * contract roots, test roots, and `npmFilesToBuild` roots.
+     *
+     * Calling this method with `scope: "tests"` in this mode is a logic error and
+     * throws a `HardhatError`.
+     *
+     * When `solidity.splitTestsCompilation` is `true`, `scope: "contracts"`
+     * returns only contract roots and `scope: "tests"` returns only test roots.
+     *
      * @returns An array of root file paths.
      */
     getRootFilePaths(options?: {
@@ -224,6 +240,15 @@ export interface SolidityBuildSystem {
     /**
      * Builds the provided files, generating their compilation artifacts.
      *
+     * When `solidity.splitTestsCompilation` is `false`, this method rejects
+     * `scope: "tests"` as a logic error and throws a `HardhatError`
+     *
+     * In this mode, callers must use `scope: "contracts"` and contracts and tests
+     * are built together, emitting their artifacts into the same directory.
+     *
+     * When `solidity.splitTestsCompilation` is `true`, both scopes are valid
+     * and are built into separate artifact directories.
+     *
      * @param rootFilePaths The files to build, which can be either absolute paths
      * or `npm:<package-name>/<file-path>` URIs.
      * @param options The options to use when building the files.
@@ -246,6 +271,9 @@ export interface SolidityBuildSystem {
      * can be returned for multiple files, so you should deduplicate the results
      * before using them.
      *
+     * When `solidity.splitTestsCompilation` is `false`, this method rejects
+     * `scope: "tests"` as a logic error and throws a `HardhatError`.
+     *
      * @param rootFilePaths The files to analyze, which can be either absolute
      * paths or `npm:<package-name>/<file-path>` URIs.
      * @param options The options to use when analyzing the files.
@@ -278,6 +306,13 @@ export interface SolidityBuildSystem {
     /**
      * Emits the artifacts of the given compilation job.
      *
+     * When `solidity.splitTestsCompilation` is `false`, this method rejects
+     * `scope: "tests"` as a logic error and throws a `HardhatError`
+     *
+     * Artifacts for both contracts and tests are emitted under the main artifacts
+     * directory when built with `scope: "contracts"` and `splitTestsCompilation`
+     * `false`.
+     *
      * @param compilationJob The compilation job to emit the artifacts of.
      * @param compilerOutput The result of running the compilation job.
      * @returns A map from user source name to the absolute paths of the
@@ -296,7 +331,25 @@ export interface SolidityBuildSystem {
      * This method should only be used after a complete build has succeeded, as
      * it relies on the build system to have generated all the necessary artifact
      * files.
-  
+     *
+     * When `solidity.splitTestsCompilation` is `false`, this method rejects
+     * `scope: "tests"` as a logic error and throws a `HardhatError`. Cleanup in
+     * this mode operates on the main artifacts directory using `scope:
+     * "contracts"`.
+     *
+     * What is considered a complete build changes according to
+     * `splitTestsCompilation`:
+     *  - When it's `true`
+     *    - A full "contracts" build is run when `--no-contracts` isn't used, and
+     *      no explicit contract `files` are provided (i.e. you can still provide
+     *      explicit test `files`).
+     *    - A full "tests" build is run when `--no-tests` isn't used, and no
+     *      explicit test files `files` are provided (i.e. you can still provide
+     *      explicit contract `files`)
+     *  - When it's `false`
+     *    - A full build is when `files`, `--no-contracts`, nor `--no-tests` are
+     *      used.
+     *
      * @param rootFilePaths All the root files of the project.
      */
     cleanupArtifacts(rootFilePaths: string[], options?: {
@@ -316,7 +369,17 @@ export interface SolidityBuildSystem {
      */
     compileBuildInfo(buildInfo: SolidityBuildInfo, options?: CompileBuildInfoOptions): Promise<CompilerOutput>;
     /**
-     * Gets the artifacts directory for a given target (contracts/tests)
+     * Gets the artifacts directory for a given target (contracts/tests).
+     *
+     * When `solidity.splitTestsCompilation` is `false`, both scopes return the
+     * main artifacts directory, because contracts and tests share it.
+     *
+     * Unlike the other scope-aware methods, this one does not throw on that mode,
+     * as it's a read-only method that can be helpful for plugins.
+     *
+     * When `solidity.splitTestsCompilation` is `true`, `scope: "contracts"`
+     * returns the main artifacts directory and `scope: "tests"` returns a
+     * separate test-artifacts directory under the cache path.
      */
     getArtifactsDirectory(scope: BuildScope): Promise<string>;
 }

package/dist/src/types/solidity/build-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/build-system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-system.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/build-system.ts"],"names":[],"mappings":"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"}

package/dist/src/types/solidity/build-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../src/types/solidity/build-system.ts"],"names":[],"mappings":"AAqFA,MAAM,CAAN,IAAY,iCAmCX;AAnCD,WAAY,iCAAiC;IAC3C;;OAEG;IACH,kHAA6E,CAAA;IAE7E;;OAEG;IACH,8HAAyF,CAAA;IAEzF;;OAEG;IACH,gGAA2D,CAAA;IAE3D;;OAEG;IACH,oJAA+G,CAAA;IAE/G;;OAEG;IACH,kHAA6E,CAAA;IAE7E;;OAEG;IACH,kJAA6G,CAAA;IAE7G;;OAEG;IACH,0GAAqE,CAAA;AACvE,CAAC,EAnCW,iCAAiC,KAAjC,iCAAiC,QAmC5C;AAyDD;;GAEG;AACH,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;AACjC,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}
+{"version":3,"file":"build-system.js","sourceRoot":"","sources":["../../../../src/types/solidity/build-system.ts"],"names":[],"mappings":"AA2FA,MAAM,CAAN,IAAY,iCAmCX;AAnCD,WAAY,iCAAiC;IAC3C;;OAEG;IACH,kHAA6E,CAAA;IAE7E;;OAEG;IACH,8HAAyF,CAAA;IAEzF;;OAEG;IACH,gGAA2D,CAAA;IAE3D;;OAEG;IACH,oJAA+G,CAAA;IAE/G;;OAEG;IACH,kHAA6E,CAAA;IAE7E;;OAEG;IACH,kJAA6G,CAAA;IAE7G;;OAEG;IACH,0GAAqE,CAAA;AACvE,CAAC,EAnCW,iCAAiC,KAAjC,iCAAiC,QAmC5C;AAyDD;;GAEG;AACH,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;AACjC,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}

package/dist/src/types/solidity/compilation-job.d.ts

@@ -1,8 +1,9 @@
 import type { CompilerInput } from "./compiler-io.js";
 import type { DependencyGraph } from "./dependency-graph.js";
-import type { SolcConfig } from "../config.js";
+import type { ToolVersions } from "./solidity-artifacts.js";
+import type { SolidityCompilerConfig } from "../config.js";
 /**
- * A compilation job to be run using solc.
+ * A compilation job to be run.
  */
 export interface CompilationJob {
     /**
@@ -11,13 +12,18 @@ export interface CompilationJob {
      */
     dependencyGraph: DependencyGraph;
     /**
-     * The solc config to use.
+     * The compiler config to use.
      */
-    solcConfig: SolcConfig;
+    solcConfig: SolidityCompilerConfig;
     /**
-     * The long version of the solc compiler to be used.
+     * The long version of the compiler to be used.
      */
     solcLongVersion: string;
+    /**
+     * The versions to include in the build info, if any.
+     * When present, these versions influence the build id.
+     */
+    toolVersions?: ToolVersions;
     /**
      * Returns the solc input to be used.
      */

package/dist/src/types/solidity/compilation-job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC;IAEjC;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAEvC;;;;;;;;;OASG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B"}
+{"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC;IAEjC;;OAEG;IACH,UAAU,EAAE,sBAAsB,CAAC;IAEnC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B;;OAEG;IACH,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAEvC;;;;;;;;;OASG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B"}

package/dist/src/types/solidity/solidity-artifacts.d.ts

@@ -1,4 +1,11 @@
 import type { CompilerInput, CompilerOutput } from "./compiler-io.js";
+/**
+ * A record with the versions of the different tools used to create a
+ * build info.
+ */
+export interface ToolVersions {
+    readonly hardhat: string;
+}
 /**
  * A SolidityBuildInfo is a file that contains all the information of a solc
  * run. It includes all the necessary information to recreate that exact same
@@ -12,6 +19,12 @@ export interface SolidityBuildInfo {
     /**
      * The id of the build, which is derived from the rest of the data,
      * guaranteeing that it's unique and deterministic.
+     *
+     * When `compilerType` is present and is not "solc", the format is:
+     *   `solc-<major>_<minor>_<patch>-<compiler-type>-<job-hash>`
+     *
+     * Otherwise (i.e. solc or undefined), the format is:
+     *   `solc-<major>_<minor>_<patch>-<job-hash>`
      */
     readonly id: string;
     /**
@@ -22,6 +35,22 @@ export interface SolidityBuildInfo {
      * The long solc version used to compile the build.
      */
     readonly solcLongVersion: string;
+    /**
+     * The compiler type used for this build. If absent or undefined, it means
+     * "solc" was used.
+     *
+     * Note: This is typed as `string` rather than `SolidityCompilerType` because
+     * the build info may come from a different Hardhat setup where the compiler
+     * type may not be registered in the current type definitions.
+     */
+    readonly compilerType?: string;
+    /**
+     * Versions of the different tools used to create this build info.
+     *
+     * Not present if the build profile used to create this build info
+     * had `toolVersionsInBuildInfo` as `false`.
+     */
+    readonly toolVersions?: ToolVersions;
     /**
      * A mapping from user source names to input source names, for the root
      * files of the build (i.e. the files whose artifacts where being compiled).

package/dist/src/types/solidity/solidity-artifacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solidity-artifacts.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/solidity-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEtE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IAEzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC;;;;;;;OAOG;IACH,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,6BAA6B,CAAC;IAEhD;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACjC"}
+{"version":3,"file":"solidity-artifacts.d.ts","sourceRoot":"","sources":["../../../../src/types/solidity/solidity-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEtE;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IAEzC;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC;;;;;;;OAOG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAErC;;;;;;;OAOG;IACH,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,6BAA6B,CAAC;IAEhD;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACjC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "hardhat",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "Hardhat is an extensible developer tool that helps smart contract developers increase productivity by reliably bringing together the tools they want.",
-  "homepage": "https://github.com/nomicfoundation/hardhat/tree/v-next/v-next/hardhat",
+  "homepage": "https://hardhat.org",
   "repository": {
     "type": "git",
     "url": "https://github.com/NomicFoundation/hardhat",
-    "directory": "v-next/hardhat"
+    "directory": "packages/hardhat"
   },
   "author": "Nomic Foundation",
   "license": "MIT",
@@ -39,6 +39,7 @@
     "./console.sol": "./console.sol",
     "./internal/coverage": "./dist/src/internal/builtin-plugins/coverage/exports.js",
     "./internal/gas-analytics": "./dist/src/internal/builtin-plugins/gas-analytics/exports.js",
+    "./internal/solidity": "./dist/src/internal/builtin-plugins/solidity/exports.js",
     "./utils/contract-names": "./dist/src/utils/contract-names.js",
     "./utils/result": "./dist/src/utils/result.js",
     "./types/runtime": "./dist/src/internal/deprecated-module-imported-from-hardhat2-plugin.js",
@@ -61,7 +62,7 @@
     "README.md"
   ],
   "devDependencies": {
-    "@nomicfoundation/hardhat-node-test-reporter": "^3.0.2",
+    "@nomicfoundation/hardhat-node-test-reporter": "^3.0.4",
     "@types/adm-zip": "^0.5.5",
     "@types/debug": "^4.1.7",
     "@types/node": "^22.0.0",
@@ -76,11 +77,11 @@
     "@nomicfoundation/hardhat-test-utils": "^2.0.2"
   },
   "dependencies": {
-    "@nomicfoundation/edr": "0.12.0-next.28",
-    "@nomicfoundation/hardhat-errors": "^3.0.9",
-    "@nomicfoundation/hardhat-utils": "^4.0.1",
-    "@nomicfoundation/hardhat-vendored": "^3.0.1",
-    "@nomicfoundation/hardhat-zod-utils": "^3.0.3",
+    "@nomicfoundation/edr": "0.12.0-next.29",
+    "@nomicfoundation/hardhat-errors": "^3.0.11",
+    "@nomicfoundation/hardhat-utils": "^4.0.3",
+    "@nomicfoundation/hardhat-vendored": "^3.0.2",
+    "@nomicfoundation/hardhat-zod-utils": "^3.0.4",
     "@nomicfoundation/solidity-analyzer": "^0.1.1",
     "@sentry/core": "^9.4.0",
     "adm-zip": "^0.4.16",

package/src/internal/builtin-global-options.ts

@@ -1,8 +1,10 @@
 import type { GlobalOptionDefinitions } from "../types/global-options.js";
 
-import { globalFlag, globalOption } from "../config.js";
+import { globalFlag, globalLevel, globalOption } from "../config.js";
 import { ArgumentType } from "../types/arguments.js";
 
+import { DEFAULT_VERBOSITY } from "./constants.js";
+
 export const BUILTIN_GLOBAL_OPTIONS_DEFINITIONS: GlobalOptionDefinitions =
   new Map([
     [
@@ -49,6 +51,18 @@ export const BUILTIN_GLOBAL_OPTIONS_DEFINITIONS: GlobalOptionDefinitions =
         }),
       },
     ],
+    [
+      "verbosity",
+      {
+        pluginId: "builtin",
+        option: globalLevel({
+          name: "verbosity",
+          shortName: "v",
+          description: "Verbosity level of the output.",
+          defaultValue: DEFAULT_VERBOSITY,
+        }),
+      },
+    ],
     [
       "version",
       {

package/src/internal/builtin-plugins/artifacts/artifact-manager.ts

@@ -81,22 +81,16 @@ export class ArtifactManagerImplementation implements ArtifactManager {
   public async artifactExists(
     contractNameOrFullyQualifiedName: string,
   ): Promise<boolean> {
-    try {
-      // This throw if the artifact doesn't exist
-      await this.getArtifactPath(contractNameOrFullyQualifiedName);
-
-      return true;
-    } catch (error) {
-      if (HardhatError.isHardhatError(error)) {
-        if (
-          error.number === HardhatError.ERRORS.CORE.ARTIFACTS.NOT_FOUND.number
-        ) {
-          return false;
-        }
-      }
+    const { bareNameToFullyQualifiedNameMap, allFullyQualifiedNames } =
+      await this.#getFsData();
 
-      throw error;
+    if (this.#isFullyQualifiedName(contractNameOrFullyQualifiedName)) {
+      return allFullyQualifiedNames.has(contractNameOrFullyQualifiedName);
     }
+
+    return bareNameToFullyQualifiedNameMap.has(
+      contractNameOrFullyQualifiedName,
+    );
   }
 
   public async getBuildInfoId(
@@ -191,7 +185,7 @@ export class ArtifactManagerImplementation implements ArtifactManager {
         HardhatError.ERRORS.CORE.ARTIFACTS.MULTIPLE_FOUND,
         {
           contractName: contractNameOrFullyQualifiedName,
-          candidates: Array.from(fqns).join(EOL),
+          candidates: Array.from(fqns).sort().join(EOL),
         },
       );
     }

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

@@ -42,7 +42,8 @@ const consoleAction: NewTaskActionFunction<ConsoleActionArguments> = async (
     }
 
     if (!noCompile) {
-      await hre.tasks.getTask("build").run({ noTests: true, quiet: true });
+      const noTests = hre.config.solidity.splitTestsCompilation;
+      await hre.tasks.getTask("build").run({ noTests, quiet: true });
     }
 
     return await new Promise<REPLServer>(async (resolve) => {

package/src/internal/builtin-plugins/gas-analytics/exports.ts

@@ -2,4 +2,4 @@ export {
   markTestRunStart,
   markTestRunDone,
   markTestWorkerDone,
-} from "./helpers.js";
+} from "./helpers/compat.js";

package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts

@@ -17,8 +17,7 @@ import {
   parseFullyQualifiedName,
 } from "../../../utils/contract-names.js";
 
-import { getUserFqn } from "./gas-analytics-manager.js";
-import { formatSectionHeader } from "./helpers.js";
+import { formatSectionHeader, getUserFqn } from "./helpers/utils.js";
 
 export const FUNCTION_GAS_SNAPSHOTS_FILE = ".gas-snapshot";
 

package/src/internal/builtin-plugins/gas-analytics/gas-analytics-manager.ts

@@ -1,5 +1,6 @@
 import type {
   ContractGasStatsJson,
+  DeploymentGasStatsJsonEntry,
   GasAnalyticsManager,
   GasMeasurement,
   GasStatsJson,
@@ -10,7 +11,10 @@ import type { TableItem } from "@nomicfoundation/hardhat-utils/format";
 import crypto from "node:crypto";
 import path from "node:path";
 
-import { HardhatError } from "@nomicfoundation/hardhat-errors";
+import {
+  HardhatError,
+  assertHardhatInvariant,
+} from "@nomicfoundation/hardhat-errors";
 import { formatTable } from "@nomicfoundation/hardhat-utils/format";
 import {
   ensureDir,
@@ -27,12 +31,27 @@ import debug from "debug";
 
 import { parseFullyQualifiedName } from "../../../utils/contract-names.js";
 
+import {
+  avg,
+  getDisplayKey,
+  getFunctionName,
+  getProxyLabel,
+  getUserFqn,
+  makeGroupKey,
+  median,
+} from "./helpers/utils.js";
+
 const gasStatsLog = debug(
   "hardhat:core:gas-analytics:gas-analytics-manager:gas-stats",
 );
 
+interface DeploymentGasStats extends GasStats {
+  runtimeSize: number;
+}
+
 interface ContractGasStats {
-  deployment?: GasStats;
+  proxyChain: string[];
+  deployment?: DeploymentGasStats;
   functions: Map<
     string, // function name or signature (if overloaded)
     GasStats
@@ -52,7 +71,9 @@ interface GasStats {
 type GasMeasurementsByContract = Map<string, ContractGasMeasurements>;
 
 interface ContractGasMeasurements {
+  proxyChain: string[];
   deployments: number[];
+  deploymentRuntimeSize?: number;
   functions: Map<
     string, // functionSig
     number[]
@@ -170,18 +191,25 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
     const gasStatsByContract: GasStatsByContract = new Map();
     const measurementsByContract = this._aggregateGasMeasurements();
 
-    for (const [contractFqn, measurements] of measurementsByContract) {
+    for (const [groupKey, measurements] of measurementsByContract) {
       const contractGasStats: ContractGasStats = {
+        proxyChain: measurements.proxyChain,
         functions: new Map(),
       };
 
       if (measurements.deployments.length > 0) {
+        assertHardhatInvariant(
+          measurements.deploymentRuntimeSize !== undefined,
+          "deploymentRuntimeSize must be set when deployments exist",
+        );
+
         contractGasStats.deployment = {
           min: Math.min(...measurements.deployments),
           max: Math.max(...measurements.deployments),
           avg: Math.round(avg(measurements.deployments)),
           median: Math.round(median(measurements.deployments)),
           count: measurements.deployments.length,
+          runtimeSize: measurements.deploymentRuntimeSize,
         };
       }
 
@@ -207,7 +235,20 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
         );
       }
 
-      gasStatsByContract.set(contractFqn, contractGasStats);
+      gasStatsByContract.set(groupKey, contractGasStats);
+    }
+
+    // Duplicate deployment stats from direct-call groups to proxied groups
+    for (const [groupKey, stats] of gasStatsByContract) {
+      if (stats.proxyChain.length > 0 && stats.deployment === undefined) {
+        // Extract contractFqn from the groupKey (everything before the first \0)
+        const contractFqn = groupKey.split("\0")[0];
+        const directKey = makeGroupKey(contractFqn, []);
+        const directStats = gasStatsByContract.get(directKey);
+        if (directStats?.deployment !== undefined) {
+          stats.deployment = directStats.deployment;
+        }
+      }
     }
 
     return gasStatsByContract;
@@ -220,22 +261,28 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
     const measurementsByContract: GasMeasurementsByContract = new Map();
 
     for (const currentMeasurement of this.gasMeasurements) {
-      let contractMeasurements = measurementsByContract.get(
-        currentMeasurement.contractFqn,
-      );
+      const proxyChain =
+        currentMeasurement.type === "function"
+          ? currentMeasurement.proxyChain
+          : [];
+      const groupKey = makeGroupKey(currentMeasurement.contractFqn, proxyChain);
+
+      let contractMeasurements = measurementsByContract.get(groupKey);
       if (contractMeasurements === undefined) {
         contractMeasurements = {
+          proxyChain,
           deployments: [],
           functions: new Map(),
         };
-        measurementsByContract.set(
-          currentMeasurement.contractFqn,
-          contractMeasurements,
-        );
+        measurementsByContract.set(groupKey, contractMeasurements);
       }
 
       if (currentMeasurement.type === "deployment") {
         contractMeasurements.deployments.push(currentMeasurement.gas);
+        if (contractMeasurements.deploymentRuntimeSize === undefined) {
+          contractMeasurements.deploymentRuntimeSize =
+            currentMeasurement.runtimeSize;
+        }
       } else {
         let measurements = contractMeasurements.functions.get(
           currentMeasurement.functionSig,
@@ -267,15 +314,16 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
       rows.push({ type: "title", text: chalk.bold("Gas Usage Statistics") });
     }
 
-    // Sort contracts alphabetically for consistent output
-    const sortedContracts = [...gasStatsByContract.entries()].sort(([a], [b]) =>
-      a.localeCompare(b),
-    );
-
-    for (const [contractFqn, contractGasStats] of sortedContracts) {
+    const sortedContracts = getSortedContractEntries(gasStatsByContract);
+    for (const {
+      userFqn,
+      proxyLabel,
+      stats: contractGasStats,
+    } of sortedContracts) {
       rows.push({
         type: "section-header",
-        text: chalk.cyan.bold(getUserFqn(contractFqn)),
+        text: chalk.cyan.bold(userFqn),
+        subtitle: proxyLabel !== undefined ? chalk.cyan(proxyLabel) : undefined,
       });
 
       if (contractGasStats.functions.size > 0) {
@@ -337,6 +385,13 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
             `${contractGasStats.deployment.count}`,
           ],
         });
+        rows.push({
+          type: "header",
+          cells: [
+            chalk.yellow("Bytecode size"),
+            `${contractGasStats.deployment.runtimeSize}`,
+          ],
+        });
       }
     }
 
@@ -349,19 +404,13 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
   public _generateGasStatsJson(
     gasStatsByContract: GasStatsByContract,
   ): GasStatsJson {
-    const sortedContracts = [...gasStatsByContract.entries()]
-      .map(([internalFqn, stats]) => ({
-        userFqn: getUserFqn(internalFqn),
-        stats,
-      }))
-      .sort((a, b) => a.userFqn.localeCompare(b.userFqn));
-
+    const sortedContracts = getSortedContractEntries(gasStatsByContract);
     const contracts: Record<string, ContractGasStatsJson> = {};
 
-    for (const { userFqn, stats } of sortedContracts) {
+    for (const { userFqn, displayKey, stats } of sortedContracts) {
       const { sourceName, contractName } = parseFullyQualifiedName(userFqn);
 
-      const deployment: GasStatsJsonEntry | null =
+      const deployment: DeploymentGasStatsJsonEntry | null =
         stats.deployment !== undefined ? { ...stats.deployment } : null;
 
       let functions: Record<string, GasStatsJsonEntry> | null = null;
@@ -377,44 +426,34 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
         functions = Object.fromEntries(sortedFunctions);
       }
 
-      contracts[userFqn] = { sourceName, contractName, deployment, functions };
+      contracts[displayKey] = {
+        sourceName,
+        contractName,
+        proxyChain: stats.proxyChain.map(getUserFqn),
+        deployment,
+        functions,
+      };
     }
 
     return { contracts };
   }
 }
 
-export function avg(values: number[]): number {
-  return values.reduce((a, c) => a + c, 0) / values.length;
-}
-
-export function median(values: number[]): number {
-  const sorted = [...values].sort((a, b) => a - b);
-  const mid = Math.floor(sorted.length / 2);
-
-  return sorted.length % 2 === 1
-    ? sorted[mid]
-    : (sorted[mid - 1] + sorted[mid]) / 2;
-}
-
-export function getUserFqn(inputFqn: string): string {
-  if (inputFqn.startsWith("project/")) {
-    return inputFqn.slice("project/".length);
-  }
-
-  if (inputFqn.startsWith("npm/")) {
-    const withoutPrefix = inputFqn.slice("npm/".length);
-    // Match "<pkg>@<version>/<rest>", where <pkg> may be scoped (@scope/pkg)
-    const match = withoutPrefix.match(/^(@?[^@/]+(?:\/[^@/]+)*)@[^/]+\/(.*)$/);
-    if (match !== null) {
-      return `${match[1]}/${match[2]}`;
-    }
-    return withoutPrefix;
-  }
-
-  return inputFqn;
-}
-
-export function getFunctionName(signature: string): string {
-  return signature.split("(")[0];
+function getSortedContractEntries(
+  gasStatsByContract: GasStatsByContract,
+): Array<{
+  userFqn: string;
+  displayKey: string;
+  proxyLabel: string | undefined;
+  stats: ContractGasStats;
+}> {
+  return [...gasStatsByContract.entries()]
+    .map(([groupKey, stats]) => {
+      const contractFqn = groupKey.split("\0")[0];
+      const userFqn = getUserFqn(contractFqn);
+      const displayKey = getDisplayKey(userFqn, stats.proxyChain);
+      const proxyLabel = getProxyLabel(stats.proxyChain);
+      return { userFqn, displayKey, proxyLabel, stats };
+    })
+    .sort((a, b) => a.displayKey.localeCompare(b.displayKey));
 }