hardhat 3.1.12 → 3.3.0

package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js

@@ -1,20 +1,42 @@
+import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
 import chalk from "chalk";
+import { HardhatRuntimeEnvironmentImplementation } from "../../core/hre.js";
+import { GasAnalyticsManagerImplementation } from "./gas-analytics-manager.js";
 import { testRunDone, testRunStart, testWorkerDone, } from "./hook-handlers/test.js";
+export function getGasAnalyticsManager(hookContextOrHre) {
+    assertHardhatInvariant("_gasAnalytics" in hookContextOrHre &&
+        hookContextOrHre._gasAnalytics instanceof
+            GasAnalyticsManagerImplementation, "Expected _gasAnalytics to be an instance of GasAnalyticsManagerImplementation");
+    return hookContextOrHre._gasAnalytics;
+}
+export function setGasAnalyticsManager(hre, gasAnalyticsManager) {
+    assertHardhatInvariant(hre instanceof HardhatRuntimeEnvironmentImplementation, "Expected HRE to be an instance of HardhatRuntimeEnvironmentImplementation");
+    hre._gasAnalytics = gasAnalyticsManager;
+}
 /**
  * The following helpers are kept for backward compatibility with older versions
  * of test runner plugins (hardhat-mocha, hardhat-node-test-runner) that import
  * from "hardhat/internal/gas-analytics".
  */
+// Dynamically import the HRE when calling the helpers
+let cachedHre;
+async function getHre() {
+    if (cachedHre === undefined) {
+        const { default: hre } = await import("../../../index.js");
+        cachedHre = hre;
+    }
+    return cachedHre;
+}
 export async function markTestRunStart(id) {
-    const { default: hre } = await import("../../../index.js");
+    const hre = await getHre();
     await testRunStart(hre, id);
 }
 export async function markTestWorkerDone(id) {
-    const { default: hre } = await import("../../../index.js");
+    const hre = await getHre();
     await testWorkerDone(hre, id);
 }
 export async function markTestRunDone(id) {
-    const { default: hre } = await import("../../../index.js");
+    const hre = await getHre();
     await testRunDone(hre, id);
 }
 export function formatSectionHeader(sectionName, { changedLength, addedLength, removedLength, }) {

package/dist/src/internal/builtin-plugins/gas-analytics/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC;;;;GAIG;AAEH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAU;IAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAU;IACjD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAU;IAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,WAAmB,EACnB,EACE,aAAa,EACb,WAAW,EACX,aAAa,GAKd;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,QAAQ,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,UAAU,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,WAAW,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,uCAAuC,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,iCAAiC,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EACL,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,MAAM,UAAU,sBAAsB,CACpC,gBAAyD;IAEzD,sBAAsB,CACpB,eAAe,IAAI,gBAAgB;QACjC,gBAAgB,CAAC,aAAa;YAC5B,iCAAiC,EACrC,+EAA+E,CAChF,CAAC;IACF,OAAO,gBAAgB,CAAC,aAAa,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,GAA8B,EAC9B,mBAAwC;IAExC,sBAAsB,CACpB,GAAG,YAAY,uCAAuC,EACtD,2EAA2E,CAC5E,CAAC;IACF,GAAG,CAAC,aAAa,GAAG,mBAAmB,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AAEH,sDAAsD;AACtD,IAAI,SAAgD,CAAC;AACrD,KAAK,UAAU,MAAM;IACnB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC3D,SAAS,GAAG,GAAG,CAAC;IAClB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAU;IAC/C,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;IAC3B,MAAM,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAU;IACjD,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;IAC3B,MAAM,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAU;IAC9C,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;IAC3B,MAAM,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,WAAmB,EACnB,EACE,aAAa,EACb,WAAW,EACX,aAAa,GAKd;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,QAAQ,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,UAAU,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,WAAW,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"hre.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;8BAOxD,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAAzE,wBAyBG"}
+{"version":3,"file":"hre.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;8BAKxD,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;AAAzE,wBAuBG"}

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

@@ -1,12 +1,11 @@
-import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
-import { HardhatRuntimeEnvironmentImplementation } from "../../../core/hre.js";
 import { GasAnalyticsManagerImplementation } from "../gas-analytics-manager.js";
+import { setGasAnalyticsManager } from "../helpers.js";
 export default async () => ({
     created: async (context, hre) => {
-        if (context.globalOptions.gasStats) {
+        if (context.globalOptions.gasStats ||
+            context.globalOptions.gasStatsJson !== undefined) {
             const gasAnalyticsManager = new GasAnalyticsManagerImplementation(hre.config.paths.cache);
-            assertHardhatInvariant(hre instanceof HardhatRuntimeEnvironmentImplementation, "Expected HRE to be an instance of HardhatRuntimeEnvironmentImplementation");
-            hre._gasAnalytics = gasAnalyticsManager;
+            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

package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.js.map

@@ -1 +1 @@
-{"version":3,"file":"hre.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,uCAAuC,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAEhF,eAAe,KAAK,IAAsD,EAAE,CAAC,CAAC;IAC5E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAC9B,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,mBAAmB,GAAG,IAAI,iCAAiC,CAC/D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CACvB,CAAC;YAEF,sBAAsB,CACpB,GAAG,YAAY,uCAAuC,EACtD,2EAA2E,CAC5E,CAAC;YAEF,GAAG,CAAC,aAAa,GAAG,mBAAmB,CAAC;YAExC,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE;gBACpC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE;oBAC7C,mBAAmB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBACxD,CAAC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"hre.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/hre.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAe,KAAK,IAAsD,EAAE,CAAC,CAAC;IAC5E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAC9B,IACE,OAAO,CAAC,aAAa,CAAC,QAAQ;YAC9B,OAAO,CAAC,aAAa,CAAC,YAAY,KAAK,SAAS,EAChD,CAAC;YACD,MAAM,mBAAmB,GAAG,IAAI,iCAAiC,CAC/D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CACvB,CAAC;YAEF,sBAAsB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YAEjD,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE;gBACpC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE;oBAC7C,mBAAmB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBACxD,CAAC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}

package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;8BAOhD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAApD,wBAeG;AAEH,wBAAsB,YAAY,CAChC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAUf"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;8BAIhD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAApD,wBAeG;AASH,wBAAsB,YAAY,CAChC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAUf"}

package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js

@@ -1,6 +1,4 @@
-import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
-import { isObject } from "@nomicfoundation/hardhat-utils/lang";
-import { GasAnalyticsManagerImplementation } from "../gas-analytics-manager.js";
+import { getGasAnalyticsManager } from "../helpers.js";
 export default async () => ({
     onTestRunStart: async (context, id, next) => {
         await next(context, id);
@@ -15,28 +13,26 @@ export default async () => ({
         await testRunDone(context, id);
     },
 });
+function isGasStatsEnabled(context) {
+    return (context.globalOptions.gasStats === true ||
+        context.globalOptions.gasStatsJson !== undefined);
+}
 export async function testRunStart(context, id) {
-    if (context.globalOptions.gasStats === true) {
-        assertHardhatInvariant("_gasAnalytics" in context &&
-            isObject(context._gasAnalytics) &&
-            context._gasAnalytics instanceof GasAnalyticsManagerImplementation, "Expected HookContext#_gasAnalytics to be an instance of GasAnalyticsManagerImplementation");
-        await context._gasAnalytics.clearGasMeasurements(id);
+    if (isGasStatsEnabled(context)) {
+        await getGasAnalyticsManager(context).clearGasMeasurements(id);
     }
 }
 export async function testWorkerDone(context, id) {
-    if (context.globalOptions.gasStats === true) {
-        assertHardhatInvariant("_gasAnalytics" in context &&
-            isObject(context._gasAnalytics) &&
-            context._gasAnalytics instanceof GasAnalyticsManagerImplementation, "Expected HookContext#_gasAnalytics to be an instance of GasAnalyticsManagerImplementation");
-        await context._gasAnalytics.saveGasMeasurements(id);
+    if (isGasStatsEnabled(context)) {
+        await getGasAnalyticsManager(context).saveGasMeasurements(id);
     }
 }
 export async function testRunDone(context, id) {
     if (context.globalOptions.gasStats === true) {
-        assertHardhatInvariant("_gasAnalytics" in context &&
-            isObject(context._gasAnalytics) &&
-            context._gasAnalytics instanceof GasAnalyticsManagerImplementation, "Expected HookContext#_gasAnalytics to be an instance of GasAnalyticsManagerImplementation");
-        await context._gasAnalytics.reportGasStats(id);
+        await getGasAnalyticsManager(context).reportGasStats(id);
+    }
+    if (context.globalOptions.gasStatsJson !== undefined) {
+        await getGasAnalyticsManager(context).writeGasStatsJson(context.globalOptions.gasStatsJson, id);
     }
 }
 //# sourceMappingURL=test.js.map

package/dist/src/internal/builtin-plugins/gas-analytics/hook-handlers/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAEhF,eAAe,KAAK,IAAiC,EAAE,CAAC,CAAC;IACvD,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QAC1C,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QAC5C,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjC,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAoB,EACpB,EAAU;IAEV,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC5C,sBAAsB,CACpB,eAAe,IAAI,OAAO;YACxB,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;YAC/B,OAAO,CAAC,aAAa,YAAY,iCAAiC,EACpE,2FAA2F,CAC5F,CAAC;QACF,MAAM,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAoB,EACpB,EAAU;IAEV,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC5C,sBAAsB,CACpB,eAAe,IAAI,OAAO;YACxB,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;YAC/B,OAAO,CAAC,aAAa,YAAY,iCAAiC,EACpE,2FAA2F,CAC5F,CAAC;QACF,MAAM,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAoB,EACpB,EAAU;IAEV,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC5C,sBAAsB,CACpB,eAAe,IAAI,OAAO;YACxB,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;YAC/B,OAAO,CAAC,aAAa,YAAY,iCAAiC,EACpE,2FAA2F,CAC5F,CAAC;QACF,MAAM,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/gas-analytics/hook-handlers/test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAe,KAAK,IAAiC,EAAE,CAAC,CAAC;IACvD,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QAC1C,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QAC5C,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjC,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,OAAoB;IAC7C,OAAO,CACL,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI;QACvC,OAAO,CAAC,aAAa,CAAC,YAAY,KAAK,SAAS,CACjD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAoB,EACpB,EAAU;IAEV,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAoB,EACpB,EAAU;IAEV,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAoB,EACpB,EAAU;IAEV,IAAI,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,OAAO,CAAC,aAAa,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACrD,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,iBAAiB,CACrD,OAAO,CAAC,aAAa,CAAC,YAAY,EAClC,EAAE,CACH,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/src/internal/builtin-plugins/gas-analytics/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,aAiDpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,aAAa,EAAE,aAwDpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/src/internal/builtin-plugins/gas-analytics/index.js

@@ -1,4 +1,5 @@
-import { globalFlag, overrideTask } from "../../core/config.js";
+import { ArgumentType } from "../../../types/arguments.js";
+import { globalFlag, globalOption, overrideTask } from "../../core/config.js";
 import "./type-extensions.js";
 const hardhatPlugin = {
     id: "builtin:gas-analytics",
@@ -37,6 +38,12 @@ const hardhatPlugin = {
             name: "gasStats",
             description: "Collects and displays gas usage statistics for all function calls during tests",
         }),
+        globalOption({
+            name: "gasStatsJson",
+            description: "Write gas usage statistics to a JSON file at the specified path",
+            type: ArgumentType.FILE_WITHOUT_DEFAULT,
+            defaultValue: undefined,
+        }),
     ],
     hookHandlers: {
         hre: () => import("./hook-handlers/hre.js"),

package/dist/src/internal/builtin-plugins/gas-analytics/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,uBAAuB;IAC3B,KAAK,EAAE;QACL,YAAY,CAAC,MAAM,CAAC;aACjB,OAAO,CAAC;YACP,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,wCAAwC;SACtD,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,eAAe;YACrB,WAAW,EACT,mEAAmE;SACtE,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACtC,mEAAmE;gBACnE,iCAAiC;gBACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;SACF,CAAC,CAAC;aACF,KAAK,EAAE;QACV,YAAY,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;aAC/B,OAAO,CAAC;YACP,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,kBAAkB;SAChC,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,eAAe;YACrB,WAAW,EAAE,6CAA6C;SAC3D,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC,CAAC;aACrE,KAAK,EAAE;KACX;IACD,aAAa,EAAE;QACb,UAAU,CAAC;YACT,IAAI,EAAE,UAAU;YAChB,WAAW,EACT,gFAAgF;SACnF,CAAC;KACH;IACD,YAAY,EAAE;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;QAC3C,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,2BAA2B,CAAC;KACpC;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,sBAAsB,CAAC;AAE9B,MAAM,aAAa,GAAkB;IACnC,EAAE,EAAE,uBAAuB;IAC3B,KAAK,EAAE;QACL,YAAY,CAAC,MAAM,CAAC;aACjB,OAAO,CAAC;YACP,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,wCAAwC;SACtD,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,eAAe;YACrB,WAAW,EACT,mEAAmE;SACtE,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACtC,mEAAmE;gBACnE,iCAAiC;gBACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;SACF,CAAC,CAAC;aACF,KAAK,EAAE;QACV,YAAY,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;aAC/B,OAAO,CAAC;YACP,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,kBAAkB;SAChC,CAAC;aACD,OAAO,CAAC;YACP,IAAI,EAAE,eAAe;YACrB,WAAW,EAAE,6CAA6C;SAC3D,CAAC;aACD,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC,CAAC;aACrE,KAAK,EAAE;KACX;IACD,aAAa,EAAE;QACb,UAAU,CAAC;YACT,IAAI,EAAE,UAAU;YAChB,WAAW,EACT,gFAAgF;SACnF,CAAC;QACF,YAAY,CAAC;YACX,IAAI,EAAE,cAAc;YACpB,WAAW,EACT,iEAAiE;YACnE,IAAI,EAAE,YAAY,CAAC,oBAAoB;YACvC,YAAY,EAAE,SAAS;SACxB,CAAC;KACH;IACD,YAAY,EAAE;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;QAC3C,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC9C;IACD,YAAY,EAAE,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,kBAAkB,CAAC;QAC1B,MAAM,CAAC,2BAA2B,CAAC;KACpC;IACD,UAAU,EAAE,SAAS;CACtB,CAAC;AAEF,eAAe,aAAa,CAAC"}

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

@@ -2,6 +2,7 @@ import "../../../types/global-options.js";
 declare module "../../../types/global-options.js" {
     interface GlobalOptions {
         gasStats: boolean;
+        gasStatsJson: string | undefined;
     }
 }
 //# sourceMappingURL=type-extensions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAiB,aAAa;QAC5B,QAAQ,EAAE,OAAO,CAAC;KACnB;CACF"}
+{"version":3,"file":"type-extensions.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/type-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAiB,aAAa;QAC5B,QAAQ,EAAE,OAAO,CAAC;QAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;CACF"}

package/dist/src/internal/builtin-plugins/gas-analytics/types.d.ts

@@ -1,3 +1,33 @@
+/**
+ * Gas statistics for a single function call or deployment (min/max/avg/median/count).
+ */
+export interface GasStatsJsonEntry {
+    min: number;
+    max: number;
+    avg: number;
+    median: number;
+    count: number;
+}
+/**
+ * Gas statistics for a single contract in the JSON output.
+ * `deployment` is null when the contract was never deployed during the test run
+ * (e.g. deployed by a factory or via forking). `functions` is null when the
+ * contract was deployed but no functions were called.
+ */
+export interface ContractGasStatsJson {
+    sourceName: string;
+    contractName: string;
+    deployment: GasStatsJsonEntry | null;
+    functions: Record<string, GasStatsJsonEntry> | null;
+}
+/**
+ * Top-level JSON output shape produced by `--gas-stats-json`.
+ * Contract keys are user-friendly FQNs (e.g. `contracts/Foo.sol:Foo`),
+ * sorted alphabetically.
+ */
+export interface GasStatsJson {
+    contracts: Record<string, ContractGasStatsJson>;
+}
 interface BaseGasMeasurement {
     contractFqn: string;
     gas: number;
@@ -16,6 +46,9 @@ export interface GasAnalyticsManager {
     clearGasMeasurements(id: string): Promise<void>;
     saveGasMeasurements(id: string): Promise<void>;
     reportGasStats(...ids: string[]): Promise<void>;
+    writeGasStatsJson(outputPath: string, ...ids: string[]): Promise<void>;
+    enableReport(): void;
+    disableReport(): void;
 }
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/src/internal/builtin-plugins/gas-analytics/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/types.ts"],"names":[],"mappings":"AAAA,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,sBAAuB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,kBAAkB;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,wBAAwB,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAElC,iBAAiB,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACxD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/gas-analytics/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAC;CACrD;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CACjD;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,sBAAuB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,kBAAkB;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,wBAAwB,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAElC,iBAAiB,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACxD,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE,YAAY,IAAI,IAAI,CAAC;IACrB,aAAa,IAAI,IAAI,CAAC;CACvB"}

package/dist/src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-private-keys.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.ts"],"names":[],"mappings":"AAKA,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+BnB"}
+{"version":3,"file":"derive-private-keys.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.ts"],"names":[],"mappings":"AAcA,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+BnB"}

package/dist/src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.js

@@ -1,5 +1,9 @@
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
 import { bytesToHexString } from "@nomicfoundation/hardhat-utils/bytes";
+// ethereum-cryptography/bip39 is known to be slow to load, so we lazy load it
+let mnemonicToSeedSync;
+// ethereum-cryptography/hdkey is known to be slow to load, so we lazy load it
+let HDKey;
 const HD_PATH_REGEX = /^m(:?\/\d+'?)+\/?$/;
 export async function derivePrivateKeys(mnemonic, hdpath, initialIndex, count, passphrase) {
     if (!HD_PATH_REGEX.test(hdpath)) {
@@ -24,11 +28,17 @@ export async function derivePrivateKeys(mnemonic, hdpath, initialIndex, count, p
     return privateKeys;
 }
 async function deriveKeyFromMnemonicAndPath(mnemonic, hdPath, passphrase) {
-    const { mnemonicToSeedSync } = await import("ethereum-cryptography/bip39");
-    const { HDKey } = await import("ethereum-cryptography/hdkey");
     // NOTE: If mnemonic has space or newline at the beginning or end, it will be trimmed.
     // This is because mnemonic containing them may generate different private keys.
     const trimmedMnemonic = mnemonic.trim();
+    if (mnemonicToSeedSync === undefined) {
+        const { mnemonicToSeedSync: importedMnemonicToSeedSync } = await import("ethereum-cryptography/bip39");
+        mnemonicToSeedSync = importedMnemonicToSeedSync;
+    }
+    if (HDKey === undefined) {
+        const { HDKey: ImportedHDKey } = await import("ethereum-cryptography/hdkey");
+        HDKey = ImportedHDKey;
+    }
     const seed = mnemonicToSeedSync(trimmedMnemonic, passphrase);
     const masterKey = HDKey.fromMasterSeed(seed);
     const derived = masterKey.derive(hdPath);

package/dist/src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive-private-keys.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,MAAc,EACd,YAAoB,EACpB,KAAa,EACb,UAAkB;IAElB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YACvE,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,YAAY,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,4BAA4B,CACnD,QAAQ,EACR,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,EACrB,UAAU,CACX,CAAC;QAEF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvE,QAAQ;gBACR,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;QACL,CAAC;QAED,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,QAAgB,EAChB,MAAc,EACd,UAAkB;IAElB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC3E,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAE9D,sFAAsF;IACtF,gFAAgF;IAChF,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAExC,MAAM,IAAI,GAAG,kBAAkB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzC,OAAO,OAAO,CAAC,UAAU,KAAK,IAAI;QAChC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"derive-private-keys.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/accounts/derive-private-keys.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE,8EAA8E;AAC9E,IAAI,kBAAgE,CAAC;AAErE,8EAA8E;AAC9E,IAAI,KAAgC,CAAC;AAErC,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,MAAc,EACd,YAAoB,EACpB,KAAa,EACb,UAAkB;IAElB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YACvE,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,YAAY,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,4BAA4B,CACnD,QAAQ,EACR,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,EACrB,UAAU,CACX,CAAC;QAEF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvE,QAAQ;gBACR,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;QACL,CAAC;QAED,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,QAAgB,EAChB,MAAc,EACd,UAAkB;IAElB,sFAAsF;IACtF,gFAAgF;IAChF,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAExC,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAAG,MAAM,MAAM,CACrE,6BAA6B,CAC9B,CAAC;QAEF,kBAAkB,GAAG,0BAA0B,CAAC;IAClD,CAAC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAC3C,6BAA6B,CAC9B,CAAC;QAEF,KAAK,GAAG,aAAa,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzC,OAAO,OAAO,CAAC,UAAU,KAAK,IAAI;QAChC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC"}

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

@@ -6,6 +6,7 @@ import type { RequireField } from "../../../../types/utils.js";
 import type { DefaultHDAccountsConfigParams } from "../accounts/constants.js";
 import type { JsonRpcRequestWrapperFunction } from "../network-manager.js";
 import type { SubscriptionEvent, ProviderConfig, TracingConfigWithBuffers, GasReportConfig } from "@nomicfoundation/edr";
+import { ContractDecoder, IncludeTraces } from "@nomicfoundation/edr";
 import { BaseProvider } from "../base-provider.js";
 export declare const EDR_NETWORK_DEFAULT_COINBASE = "0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e";
 interface EdrNetworkDefaultHDAccountsConfigParams extends DefaultHDAccountsConfigParams {
@@ -21,17 +22,22 @@ interface EdrProviderConfig {
     chainDescriptors: ChainDescriptorsConfig;
     networkConfig: RequireField<EdrNetworkConfig, "chainType">;
     loggerConfig?: LoggerConfig;
-    tracingConfig?: TracingConfigWithBuffers;
+    contractDecoder: ContractDecoder;
     jsonRpcRequestWrapper?: JsonRpcRequestWrapperFunction;
     coverageConfig?: CoverageConfig;
     gasReportConfig?: GasReportConfig;
+    includeCallTraces?: IncludeTraces;
+    connectionId: number;
+    networkName: string;
+    verbosity: number;
 }
 export declare class EdrProvider extends BaseProvider {
     #private;
+    static createContractDecoder(tracingConfig: TracingConfigWithBuffers): Promise<ContractDecoder>;
     /**
      * Creates a new instance of `EdrProvider`.
      */
-    static create({ chainDescriptors, networkConfig, loggerConfig, tracingConfig, jsonRpcRequestWrapper, coverageConfig, gasReportConfig, }: EdrProviderConfig): Promise<EdrProvider>;
+    static create({ chainDescriptors, networkConfig, loggerConfig, contractDecoder, jsonRpcRequestWrapper, coverageConfig, gasReportConfig, includeCallTraces, verbosity, connectionId, networkName, }: EdrProviderConfig): Promise<EdrProvider>;
     /**
      * @private
      *
@@ -45,6 +51,6 @@ export declare class EdrProvider extends BaseProvider {
     addCompilationResult(solcVersion: string, compilerInput: any, compilerOutput: any): Promise<void>;
     onSubscriptionEvent(event: SubscriptionEvent): void;
 }
-export declare function getProviderConfig(networkConfig: RequireField<EdrNetworkConfig, "chainType">, coverageConfig: CoverageConfig | undefined, gasReportConfig: GasReportConfig | undefined, chainDescriptors: ChainDescriptorsConfig): Promise<ProviderConfig>;
+export declare function getProviderConfig(networkConfig: RequireField<EdrNetworkConfig, "chainType">, coverageConfig: CoverageConfig | undefined, gasReportConfig: GasReportConfig | undefined, chainDescriptors: ChainDescriptorsConfig, includeCallTraces?: IncludeTraces): Promise<ProviderConfig>;
 export {};
 //# sourceMappingURL=edr-provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"edr-provider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,0BAA0B,EAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAIV,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EACV,iBAAiB,EAGjB,cAAc,EACd,wBAAwB,EAExB,eAAe,EAChB,MAAM,sBAAsB,CAAC;AA6B9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAwBnD,eAAO,MAAM,4BAA4B,+CACK,CAAC;AAE/C,UAAU,uCACR,SAAQ,6BAA6B;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,oBAAoB,gEAC8B,CAAC;AAChE,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,6CAA6C,EAAE,uCAKzD,CAAC;AAEJ,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,eAAO,MAAM,gCAAgC,EAAE,MAAM,EAqBpD,CAAC;AAEF,UAAU,iBAAiB;IACzB,gBAAgB,EAAE,sBAAsB,CAAC;IACzC,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAC3D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,qBAAqB,CAAC,EAAE,6BAA6B,CAAC;IACtD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,WAAY,SAAQ,YAAY;;IAM3C;;OAEG;WACiB,MAAM,CAAC,EACzB,gBAAgB,EAChB,aAAa,EACb,YAAiC,EACjC,aAAkB,EAClB,qBAAqB,EACrB,cAAc,EACd,eAAe,GAChB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IA0D3C;;;;;;OAMG;IACH,OAAO;IAUM,OAAO,CAClB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAsDlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,GAAG,EAClB,cAAc,EAAE,GAAG,GAClB,OAAO,CAAC,IAAI,CAAC;IA2ET,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAkD3D;AAED,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,EAC1D,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,gBAAgB,EAAE,sBAAsB,GACvC,OAAO,CAAC,cAAc,CAAC,CAgFzB"}
+{"version":3,"file":"edr-provider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"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"}

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

@@ -1,26 +1,25 @@
-import { opGenesisState, opHardforkFromString, l1GenesisState, l1HardforkFromString, ContractDecoder, } from "@nomicfoundation/edr";
+import { ContractDecoder, IncludeTraces } from "@nomicfoundation/edr";
 import { assertHardhatInvariant, HardhatError, } from "@nomicfoundation/hardhat-errors";
 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 { hexToBytes } from "ethereum-cryptography/utils";
-import { addr } from "micro-eth-signer";
 import { sendErrorTelemetry } from "../../../cli/telemetry/sentry/reporter.js";
-import { EDR_NETWORK_REVERT_SNAPSHOT_EVENT, OPTIMISM_CHAIN_TYPE, } from "../../../constants.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 { InvalidArgumentsError, ProviderError, UnknownError, } from "../provider-errors.js";
+import { getGenesisStateAndOwnedAccounts } from "./genesis-state.js";
 import { EdrProviderStackTraceGenerationError } from "./stack-traces/stack-trace-generation-errors.js";
 import { createSolidityErrorWithStackTrace } from "./stack-traces/stack-trace-solidity-errors.js";
 import { isEdrProviderErrorData } from "./type-validation.js";
 import { clientVersion } from "./utils/client-version.js";
 import { ConsoleLogger } from "./utils/console-logger.js";
-import { hardhatMiningIntervalToEdrMiningInterval, hardhatMempoolOrderToEdrMineOrdering, hardhatHardforkToEdrSpecId, hardhatAccountsToEdrOwnedAccounts, hardhatForkingConfigToEdrForkConfig, } from "./utils/convert-to-edr.js";
+import { hardhatMiningIntervalToEdrMiningInterval, hardhatMempoolOrderToEdrMineOrdering, hardhatHardforkToEdrSpecId, hardhatForkingConfigToEdrForkConfig, } from "./utils/convert-to-edr.js";
 import { printLine, replaceLastLine } from "./utils/logger.js";
 const log = debug("hardhat:core:hardhat-network:provider");
 export const EDR_NETWORK_DEFAULT_COINBASE = "0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e";
@@ -64,18 +63,24 @@ export class EdrProvider extends BaseProvider {
     #jsonRpcRequestWrapper;
     #provider;
     #nextRequestId = 1;
+    #traceOutput;
+    static async createContractDecoder(tracingConfig) {
+        return ContractDecoder.withContracts(tracingConfig);
+    }
     /**
      * Creates a new instance of `EdrProvider`.
      */
-    static async create({ chainDescriptors, networkConfig, loggerConfig = { enabled: false }, tracingConfig = {}, jsonRpcRequestWrapper, coverageConfig, gasReportConfig, }) {
+    static async create({ chainDescriptors, networkConfig, loggerConfig = { enabled: false }, contractDecoder, jsonRpcRequestWrapper, coverageConfig, gasReportConfig, includeCallTraces, verbosity, connectionId, networkName, }) {
         const printLineFn = loggerConfig.printLineFn ?? printLine;
         const replaceLastLineFn = loggerConfig.replaceLastLineFn ?? replaceLastLine;
-        const providerConfig = await getProviderConfig(networkConfig, coverageConfig, gasReportConfig, chainDescriptors);
+        const providerConfig = await getProviderConfig(networkConfig, coverageConfig, gasReportConfig, chainDescriptors, includeCallTraces);
         let edrProvider;
+        // We use a WeakRef to the provider to prevent the subscriptionCallback
+        // below from creating a cycle and leaking the provider.
+        let edrProviderWeakRef;
         // We need to catch errors here, as the provider creation can panic unexpectedly,
         // and we want to make sure such a crash is propagated as a ProviderError.
         try {
-            const contractDecoder = ContractDecoder.withContracts(tracingConfig);
             const context = await getGlobalEdrContext();
             const provider = await context.createProvider(hardhatChainTypeToEdrChainType(networkConfig.chainType), providerConfig, {
                 enable: loggerConfig.enabled || networkConfig.loggingEnabled,
@@ -94,10 +99,21 @@ export class EdrProvider extends BaseProvider {
                 },
             }, {
                 subscriptionCallback: (event) => {
-                    edrProvider.onSubscriptionEvent(event);
+                    const deferredProvider = edrProviderWeakRef?.deref();
+                    if (deferredProvider !== undefined) {
+                        deferredProvider.onSubscriptionEvent(event);
+                    }
                 },
             }, contractDecoder);
-            edrProvider = new EdrProvider(provider, jsonRpcRequestWrapper);
+            const tracesEnabled = includeCallTraces !== undefined &&
+                includeCallTraces !== IncludeTraces.None;
+            let traceOutput;
+            if (tracesEnabled) {
+                const { TraceOutputManager: TraceOutputManagerImpl } = await import("./utils/trace-output.js");
+                traceOutput = new TraceOutputManagerImpl(printLineFn, connectionId, networkName, verbosity);
+            }
+            edrProvider = new EdrProvider(provider, traceOutput, jsonRpcRequestWrapper);
+            edrProviderWeakRef = new WeakRef(edrProvider);
         }
         catch (error) {
             ensureError(error);
@@ -113,10 +129,18 @@ export class EdrProvider extends BaseProvider {
      * Use the static method {@link EdrProvider.create} to create an instance of
      * `EdrProvider`.
      */
-    constructor(provider, jsonRpcRequestWrapper) {
+    constructor(provider, traceOutput, jsonRpcRequestWrapper) {
         super();
         this.#provider = provider;
+        this.#traceOutput = traceOutput;
         this.#jsonRpcRequestWrapper = jsonRpcRequestWrapper;
+        // After a snapshot revert, the same transactions may run again.
+        // Reset traced hashes so their traces are printed a second time.
+        if (this.#traceOutput !== undefined) {
+            this.on(EDR_NETWORK_REVERT_SNAPSHOT_EVENT, () => {
+                this.#traceOutput?.clearTracedHashes();
+            });
+        }
     }
     async request(requestArguments) {
         if (this.#provider === undefined) {
@@ -153,8 +177,10 @@ export class EdrProvider extends BaseProvider {
         }
     }
     async close() {
+        this.removeAllListeners();
         // Clear the provider reference to help with garbage collection
         this.#provider = undefined;
+        this.#traceOutput?.clearTracedHashes();
     }
     async addCompilationResult(solcVersion, compilerInput, compilerOutput) {
         if (this.#provider === undefined) {
@@ -162,8 +188,9 @@ export class EdrProvider extends BaseProvider {
         }
         await this.#provider.addCompilationResult(solcVersion, compilerInput, compilerOutput);
     }
-    async #handleEdrResponse(edrResponse) {
+    async #handleEdrResponse(edrResponse, method, params) {
         let jsonRpcResponse;
+        let txHash;
         if (typeof edrResponse.data === "string") {
             jsonRpcResponse = JSON.parse(edrResponse.data);
         }
@@ -173,6 +200,11 @@ export class EdrProvider extends BaseProvider {
         if (isFailedJsonRpcResponse(jsonRpcResponse)) {
             const responseError = jsonRpcResponse.error;
             let error;
+            // Grab the tx hash so trace deduplication can recognize this transaction later
+            const errorData = responseError.data;
+            if (isEdrProviderErrorData(errorData)) {
+                txHash = errorData.transactionHash;
+            }
             const stackTrace = edrResponse.stackTrace();
             if (stackTrace?.kind === "StackTrace") {
                 // If we have a stack trace, we know that the json rpc response data
@@ -198,10 +230,27 @@ export class EdrProvider extends BaseProvider {
                         : new ProviderError(responseError.message, responseError.code);
                 error.data = responseError.data;
             }
+            this.#traceOutput?.outputCallTraces(edrResponse, method, txHash, true);
             /* eslint-disable-next-line no-restricted-syntax -- we may throw
             non-Hardhat errors inside of an EthereumProvider */
             throw error;
         }
+        if (this.#traceOutput !== undefined) {
+            // Output call traces for successful responses. The tx hash is resolved
+            // from the response/params so the trace manager can deduplicate.
+            if (method === "eth_sendTransaction" ||
+                method === "eth_sendRawTransaction") {
+                txHash =
+                    typeof jsonRpcResponse.result === "string"
+                        ? jsonRpcResponse.result
+                        : undefined;
+            }
+            else if (method === "eth_getTransactionReceipt") {
+                // params[0] is the tx hash being queried — used to dedup receipt polling
+                txHash = typeof params?.[0] === "string" ? params[0] : undefined;
+            }
+            this.#traceOutput.outputCallTraces(edrResponse, method, txHash, false);
+        }
         return jsonRpcResponse;
     }
     onSubscriptionEvent(event) {
@@ -242,39 +291,12 @@ export class EdrProvider extends BaseProvider {
             // eslint-disable-next-line no-restricted-syntax -- allow throwing UnknownError
             throw new UnknownError(error.message, error);
         }
-        return this.#handleEdrResponse(edrResponse);
+        return this.#handleEdrResponse(edrResponse, request.method, Array.isArray(request.params) ? request.params : undefined);
     }
 }
-export async function getProviderConfig(networkConfig, coverageConfig, gasReportConfig, chainDescriptors) {
+export async function getProviderConfig(networkConfig, coverageConfig, gasReportConfig, chainDescriptors, includeCallTraces) {
     const specId = hardhatHardforkToEdrSpecId(networkConfig.hardfork, networkConfig.chainType);
-    const ownedAccounts = await hardhatAccountsToEdrOwnedAccounts(networkConfig.accounts);
-    const genesisState = new Map(ownedAccounts.map(({ secretKey, balance }) => {
-        const address = hexToBytes(addr.fromPrivateKey(secretKey));
-        const accountOverride = {
-            address,
-            balance: BigInt(balance),
-            code: new Uint8Array(), // Empty account code, removing potential delegation code when forking
-        };
-        return [address, accountOverride];
-    }));
-    const chainGenesisState = networkConfig.forking !== undefined
-        ? [] // TODO: Add support for overriding remote fork state when the local fork is different
-        : networkConfig.chainType === OPTIMISM_CHAIN_TYPE
-            ? opGenesisState(opHardforkFromString(specId))
-            : l1GenesisState(l1HardforkFromString(specId));
-    for (const account of chainGenesisState) {
-        const existingOverride = genesisState.get(account.address);
-        if (existingOverride !== undefined) {
-            // Favor the genesis state specified by the user
-            account.balance = account.balance ?? existingOverride.balance;
-            account.nonce = account.nonce ?? existingOverride.nonce;
-            account.code = account.code ?? existingOverride.code;
-            account.storage = account.storage ?? existingOverride.storage;
-        }
-        else {
-            genesisState.set(account.address, account);
-        }
-    }
+    const { genesisState, ownedAccounts } = await getGenesisStateAndOwnedAccounts(networkConfig.accounts, networkConfig.forking, networkConfig.chainType, specId);
     return {
         allowBlocksWithSameTimestamp: networkConfig.allowBlocksWithSameTimestamp,
         allowUnlimitedContractSize: networkConfig.allowUnlimitedContractSize,
@@ -300,6 +322,7 @@ export async function getProviderConfig(networkConfig, coverageConfig, gasReport
         observability: {
             codeCoverage: coverageConfig,
             gasReport: gasReportConfig,
+            includeCallTraces,
         },
         ownedAccounts: ownedAccounts.map((account) => account.secretKey),
         precompileOverrides: [],