hardhat 3.4.3 → 3.4.5

package/dist/src/internal/cli/telemetry/sentry/reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,UAAU,0FACkE,CAAC;AAE1F;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GACrD,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEhE;AAGD,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
+{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU,0FACkE,CAAC;AAE1F;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GACrD,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEhE;AAGD,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/dist/src/internal/cli/telemetry/sentry/reporter.js

@@ -1,7 +1,4 @@
-import { HardhatError, HardhatPluginError, } from "@nomicfoundation/hardhat-errors";
 import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
-import { ProviderError, UnknownError, } from "../../../builtin-plugins/network-manager/provider-errors.js";
-import { UsingHardhat2PluginError } from "../../../using-hardhat2-plugin-errors.js";
 import { getHardhatVersion } from "../../../utils/package.js";
 import { isTelemetryAllowed } from "../telemetry-permissions.js";
 const log = createDebug("hardhat:core:cli:telemetry:sentry:reporter");
@@ -70,8 +67,7 @@ class Reporter {
         this.#instance = undefined;
     }
     async reportErrorViaSubprocess(error, hint) {
-        if (!(await this.#shouldBeReported(error))) {
-            log("Error not send: this type of error should not be reported");
+        if (!this.#telemetryEnabled) {
             return false;
         }
         const { captureException, flush } = await import("@sentry/core");
@@ -87,27 +83,5 @@ class Reporter {
         await flush();
         return true;
     }
-    async #shouldBeReported(error) {
-        if (!this.#telemetryEnabled) {
-            return false;
-        }
-        if (HardhatError.isHardhatError(error) &&
-            !error.descriptor.shouldBeReported) {
-            return false;
-        }
-        if (error instanceof UsingHardhat2PluginError) {
-            return false;
-        }
-        if (HardhatPluginError.isHardhatPluginError(error)) {
-            // Don't log errors from third-party plugins
-            return false;
-        }
-        if (ProviderError.isProviderError(error) &&
-            error.code !== UnknownError.CODE) {
-            // We don't report known network related errors
-            return false;
-        }
-        return true;
-    }
 }
 //# sourceMappingURL=reporter.js.map

package/dist/src/internal/cli/telemetry/sentry/reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/reporter.ts"],"names":[],"mappings":"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"}

package/dist/src/internal/cli/telemetry/sentry/subprocess.js

@@ -24,26 +24,20 @@ init({
 });
 const envelope = JSON.parse(serializedEnvelope);
 const anonymizer = new Anonymizer(configPath);
-const filteredEnvelope = anonymizer.filterOutEventsWithExceptionsNotRaisedByHardhat(envelope);
-if (filteredEnvelope[1].length === 0) {
-    log("The events weren't raised by Hardhat, so we don't report them");
+const anonymizeResult = await anonymizer.anonymizeEventsFromEnvelope(envelope);
+if (!anonymizeResult.success) {
+    log("Failed to anonymize envelope", anonymizeResult.error);
+    captureMessage(anonymizeResult.error);
 }
 else {
-    const anonymizeResult = await anonymizer.anonymizeEventsFromEnvelope(filteredEnvelope);
-    if (!anonymizeResult.success) {
-        log("Failed to anonymize envelope", anonymizeResult.error);
-        captureMessage(anonymizeResult.error);
+    try {
+        log("Sending received envelope to Sentry");
+        await sendEnvelopeToSentryBackend(dsn, anonymizeResult.envelope);
+        log("Successfully sent received envelope to Sentry");
     }
-    else {
-        try {
-            log("Sending received envelope to Sentry");
-            await sendEnvelopeToSentryBackend(dsn, anonymizeResult.envelope);
-            log("Successfully sent received envelope to Sentry");
-        }
-        catch (e) {
-            log("Failed to send received envelope to Sentry", e);
-            captureException(e);
-        }
+    catch (e) {
+        log("Failed to send received envelope to Sentry", e);
+        captureException(e);
     }
 }
 await close();

package/dist/src/internal/cli/telemetry/sentry/subprocess.js.map

@@ -1 +1 @@
-{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/subprocess.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AAExB,MAAM,GAAG,GAAG,WAAW,CAAC,8CAA8C,CAAC,CAAC;AAExE,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,KAAK,CACX,+GAA+G,CAChH,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAChC,GAAG,CAAC,0DAA0D,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,GAAG;IACH,OAAO;IACP,SAAS,EAAE,mBAAmB,CAAC,GAAG,CAAC;IACnC,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AAE9C,MAAM,gBAAgB,GACpB,UAAU,CAAC,+CAA+C,CAAC,QAAQ,CAAC,CAAC;AAEvE,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IACrC,GAAG,CAAC,+DAA+D,CAAC,CAAC;AACvE,CAAC;KAAM,CAAC;IACN,MAAM,eAAe,GACnB,MAAM,UAAU,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAEjE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC7B,GAAG,CAAC,8BAA8B,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC3D,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,GAAG,CAAC,qCAAqC,CAAC,CAAC;YAE3C,MAAM,2BAA2B,CAAC,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;YAEjE,GAAG,CAAC,+CAA+C,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAC;YAErD,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,KAAK,EAAE,CAAC"}
+{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../../../../../src/internal/cli/telemetry/sentry/subprocess.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,mBAAmB,EACnB,2BAA2B,GAC5B,MAAM,gBAAgB,CAAC;AAExB,MAAM,GAAG,GAAG,WAAW,CAAC,8CAA8C,CAAC,CAAC;AAExE,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,KAAK,CACX,+GAA+G,CAChH,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAChC,GAAG,CAAC,0DAA0D,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,GAAG;IACH,OAAO;IACP,SAAS,EAAE,mBAAmB,CAAC,GAAG,CAAC;IACnC,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AAE9C,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;AAE/E,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IAC7B,GAAG,CAAC,8BAA8B,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IAC3D,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;KAAM,CAAC;IACN,IAAI,CAAC;QACH,GAAG,CAAC,qCAAqC,CAAC,CAAC;QAE3C,MAAM,2BAA2B,CAAC,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEjE,GAAG,CAAC,+CAA+C,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAC;QAErD,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,MAAM,KAAK,EAAE,CAAC"}

package/dist/src/types/config.d.ts

@@ -1,4 +1,3 @@
-import "../internal/builtin-plugins/index.js";
 /**
  * A configuration variable to be fetched at runtime from
  * different sources, depending on the user's setup.

package/dist/src/types/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/types/config.ts"],"names":[],"mappings":"AAEA,OAAO,sCAAsC,CAAC;AAE9C;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,uBAAuB,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,+BAA+B,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7B;;;;OAIG;IACH,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,CAC1C,gBAAgB,EAAE,qBAAqB,GAAG,MAAM,KAC7C,6BAA6B,CAAC;AAEnC;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,qBAAqB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,qBAAqB,CAAC;CACrD;AAED;;GAEG;AAGH,MAAM,WAAW,mBAAmB;CAAG;AAEvC;;GAEG;AAGH,MAAM,WAAW,qBAAqB;CAAG;AAEzC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED;;GAEG;AAGH,MAAM,WAAW,eAAe;CAAG;AAEnC;;GAEG;AAGH,MAAM,WAAW,iBAAiB;CAAG"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/types/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,uBAAuB,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,+BAA+B,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7B;;;;OAIG;IACH,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,CAC1C,gBAAgB,EAAE,qBAAqB,GAAG,MAAM,KAC7C,6BAA6B,CAAC;AAEnC;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,qBAAqB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,qBAAqB,CAAC;CACrD;AAED;;GAEG;AAGH,MAAM,WAAW,mBAAmB;CAAG;AAEvC;;GAEG;AAGH,MAAM,WAAW,qBAAqB;CAAG;AAEzC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED;;GAEG;AAGH,MAAM,WAAW,eAAe;CAAG;AAEnC;;GAEG;AAGH,MAAM,WAAW,iBAAiB;CAAG"}

package/dist/src/types/config.js

@@ -1,4 +1,2 @@
-// NOTE: We import the builtin plugins in this module, so that their
-// type-extensions are loaded when the user imports `hardhat/types/config`.
-import "../internal/builtin-plugins/index.js";
+export {};
 //# sourceMappingURL=config.js.map

package/dist/src/types/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/types/config.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,2EAA2E;AAC3E,OAAO,sCAAsC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/types/config.ts"],"names":[],"mappings":""}

package/dist/src/types/plugins.d.ts

@@ -1,7 +1,7 @@
 import type { GlobalOptionDefinition } from "./arguments.js";
 import type { HardhatHooks } from "./hooks.js";
 import type { TaskDefinition } from "./tasks.js";
-import "../internal/builtin-plugins/index.js";
+export type * from "../internal/builtin-plugins/index.js";
 declare module "./config.js" {
     interface HardhatUserConfig {
         plugins?: HardhatPlugin[];

package/dist/src/types/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/types/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,OAAO,sCAAsC,CAAC;AAK9C,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,iBAAiB;QAChC,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;KAC3B;IAED,UAAiB,aAAa;QAE5B,OAAO,EAAE,aAAa,EAAE,CAAC;KAC1B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC,CAAC;IAEhE,uBAAuB,CAAC,EAAE,KAAK,CAAC;QAC9B,SAAS,EAAE,MAAM,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,EAAE,aAAa,CAAA;SAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,EAAE,MAAM,OAAO,CAAC;YAAE,OAAO,EAAE,aAAa,CAAA;SAAE,CAAC,CAAC;KACnD,CAAC,CAAC;IAEH;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,YAAY,CAAC,EAAE,4BAA4B,CAAC;IAE5C;;OAEG;IACH,aAAa,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAEzC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B;AAED;;;;GAIG;AACH,MAAM,MAAM,4BAA4B,GAAG;KACxC,iBAAiB,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC;QACxD,OAAO,EAAE,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;KACxD,CAAC;CACH,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,0BAA0B,CACpC,aAAa,SAAS,MAAM,YAAY,IACtC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/types/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,mBAAmB,sCAAsC,CAAC;AAK1D,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,iBAAiB;QAChC,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;KAC3B;IAED,UAAiB,aAAa;QAE5B,OAAO,EAAE,aAAa,EAAE,CAAC;KAC1B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC,CAAC;IAEhE,uBAAuB,CAAC,EAAE,KAAK,CAAC;QAC9B,SAAS,EAAE,MAAM,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,EAAE,aAAa,CAAA;SAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,EAAE,MAAM,OAAO,CAAC;YAAE,OAAO,EAAE,aAAa,CAAA;SAAE,CAAC,CAAC;KACnD,CAAC,CAAC;IAEH;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,YAAY,CAAC,EAAE,4BAA4B,CAAC;IAE5C;;OAEG;IACH,aAAa,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAEzC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B;AAED;;;;GAIG;AACH,MAAM,MAAM,4BAA4B,GAAG;KACxC,iBAAiB,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC;QACxD,OAAO,EAAE,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;KACxD,CAAC;CACH,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,0BAA0B,CACpC,aAAa,SAAS,MAAM,YAAY,IACtC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC"}

package/dist/src/types/plugins.js

@@ -1,4 +1,2 @@
-// NOTE: We import the builtin plugins in this module, so that their
-// type-extensions are loaded when the user imports `hardhat/types/plugins`.
-import "../internal/builtin-plugins/index.js";
+export {};
 //# sourceMappingURL=plugins.js.map

package/dist/src/types/plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../src/types/plugins.ts"],"names":[],"mappings":"AAIA,oEAAoE;AACpE,4EAA4E;AAC5E,OAAO,sCAAsC,CAAC"}
+{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../src/types/plugins.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hardhat",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "Hardhat is an extensible developer tool that helps smart contract developers increase productivity by reliably bringing together the tools they want.",
   "homepage": "https://hardhat.org",
   "repository": {
@@ -56,7 +56,6 @@
     "src/",
     "templates/",
     "console.sol",
-    "coverage.sol",
     "CHANGELOG.md",
     "LICENSE",
     "README.md"
@@ -76,9 +75,9 @@
     "@nomicfoundation/hardhat-test-utils": "^2.0.3"
   },
   "dependencies": {
-    "@nomicfoundation/edr": "0.12.0-next.31",
+    "@nomicfoundation/edr": "0.12.0-next.32",
     "@nomicfoundation/hardhat-errors": "^3.0.12",
-    "@nomicfoundation/hardhat-utils": "^4.1.0",
+    "@nomicfoundation/hardhat-utils": "^4.1.1",
     "@nomicfoundation/hardhat-vendored": "^3.0.3",
     "@nomicfoundation/hardhat-zod-utils": "^3.0.4",
     "@nomicfoundation/solidity-analyzer": "^0.1.1",

package/src/config.ts

@@ -3,9 +3,8 @@ export * from "./internal/core/config.js";
 
 export type { HardhatUserConfig } from "./types/config.js";
 
-// NOTE: We import the builtin plugins in this module, so that their
-// type-extensions are loaded when the user imports `hardhat/config`.
-import "./internal/builtin-plugins/index.js";
+// NOTE: We export the built-in plugin types to load their type extensions
+export type * from "./internal/builtin-plugins/index.js";
 import type { HardhatUserConfig } from "./types/config.js";
 
 import { throwUsingHardhat2PluginError } from "./internal/using-hardhat2-plugin-errors.js";

package/src/hre.ts

@@ -1,6 +1,5 @@
-// NOTE: We import the builtin plugins in this module, so that their
-// type-extensions are loaded when the user imports `hardhat/hre`.
-import "./internal/builtin-plugins/index.js";
+// NOTE: We export the built-in plugin types to load their type extensions
+export type * from "./internal/builtin-plugins/index.js";
 
 export { importUserConfig } from "./internal/config-loading.js";
 export { resolveHardhatConfigPath } from "./internal/config-loading.js";

package/src/index.ts

@@ -10,9 +10,8 @@ import type { UserInterruptionManager } from "./types/user-interruptions.js";
 
 import { getOrCreateGlobalHardhatRuntimeEnvironment } from "./internal/hre-initialization.js";
 
-// NOTE: We import the builtin plugins in this module, so that their
-// type-extensions are loaded when the user imports `hardhat`.
-import "./internal/builtin-plugins/index.js";
+// NOTE: We export the built-in plugin types to load their type extensions
+export type * from "./internal/builtin-plugins/index.js";
 
 const hre: HardhatRuntimeEnvironment =
   // eslint-disable-next-line no-restricted-syntax -- Allow top-level await here

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

@@ -1,5 +1,5 @@
 import type { HardhatPlugin } from "../../../types/plugins.js";
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:artifacts",

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

@@ -2,7 +2,7 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 
 import { task } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:clean",

package/src/internal/builtin-plugins/clean/type-extensions.ts

@@ -1,4 +1,3 @@
-import "../../../types/hooks.js";
 declare module "../../../types/hooks.js" {
   export interface HardhatHooks {
     clean: CleanHooks;

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

@@ -74,7 +74,7 @@ export class CoverageManagerImplementation implements CoverageManager {
   /**
    * @private exposed for testing purposes only
    */
-  public data: CoverageData = [];
+  public data: Map<string, number> = new Map();
 
   readonly #coveragePath: string;
 
@@ -91,8 +91,8 @@ export class CoverageManagerImplementation implements CoverageManager {
   }
 
   public async addData(data: CoverageData): Promise<void> {
-    for (const entry of data) {
-      this.data.push(entry);
+    for (const tag of data) {
+      this.data.set(tag, (this.data.get(tag) ?? 0) + 1);
     }
 
     log("Added data", JSON.stringify(data, null, 2));
@@ -122,14 +122,14 @@ export class CoverageManagerImplementation implements CoverageManager {
   public async clearData(id: string): Promise<void> {
     const dataPath = await this.#getDataPath(id);
     await remove(dataPath);
-    this.data = [];
+    this.data = new Map();
     log("Cleared data from disk and memory");
   }
 
   public async saveData(id: string): Promise<void> {
     const dataPath = await this.#getDataPath(id);
     const filePath = path.join(dataPath, `${crypto.randomUUID()}.json`);
-    const data = this.data;
+    const data = Object.fromEntries(this.data);
     await writeJsonFile(filePath, data);
     log("Saved data", id, filePath);
   }
@@ -170,15 +170,19 @@ export class CoverageManagerImplementation implements CoverageManager {
    * @private exposed for testing purposes only
    */
   public async loadData(...ids: string[]): Promise<void> {
-    this.data = [];
+    this.data = new Map();
+
     for (const id of ids) {
       const dataPath = await this.#getDataPath(id);
       const filePaths = await getAllFilesMatching(dataPath);
+
       for (const filePath of filePaths) {
-        const entries = await readJsonFile<CoverageData>(filePath);
-        for (const entry of entries) {
-          this.data.push(entry);
+        const entries = await readJsonFile<Record<string, number>>(filePath);
+
+        for (const [tag, count] of Object.entries(entries)) {
+          this.data.set(tag, (this.data.get(tag) ?? 0) + count);
         }
+
         log("Loaded data", id, filePath);
       }
     }
@@ -188,7 +192,7 @@ export class CoverageManagerImplementation implements CoverageManager {
    * @private exposed for testing purposes only
    */
   public async getReport(): Promise<Report> {
-    const allExecutedTags = new Set(this.data);
+    const allExecutedTags = this.data;
 
     const reportPromises = Array.from(this.filesMetadata.entries()).map(
       async ([fileRelativePath, fileStatements]) => {

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

@@ -3,20 +3,16 @@ import type { CoverageMetadata } from "../types.js";
 
 import path from "node:path";
 
+import { getCoverageLibrary } from "@nomicfoundation/edr/coverage";
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
 import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
-import { readUtf8File } from "@nomicfoundation/hardhat-utils/fs";
-import { findClosestPackageRoot } from "@nomicfoundation/hardhat-utils/package";
 
 import { getCoverageManager } from "../helpers/accessors.js";
 import { instrumentSolidityFileForCompilationJob } from "../instrumentation.js";
 
 const log = createDebug("hardhat:core:coverage:hook-handlers:solidity");
 
-const COVERAGE_LIBRARY_PATH =
-  "__hardhat_coverage_library_a3e9cfe2-41b4-4a1f-ad9e-ac62dd82979e.sol";
-
 export default async (): Promise<Partial<SolidityHooks>> => ({
   preprocessProjectFileBeforeBuilding: async (
     context,
@@ -37,7 +33,6 @@ export default async (): Promise<Partial<SolidityHooks>> => ({
           compilationJobSolcVersion: solcVersion,
           sourceName,
           fileContent,
-          coverageLibraryPath: COVERAGE_LIBRARY_PATH,
         });
 
         // TODO: Remove this once EDR starts returning line information as part
@@ -99,14 +94,16 @@ export default async (): Promise<Partial<SolidityHooks>> => ({
   },
   preprocessSolcInputBeforeBuilding: async (context, solcInput, next) => {
     if (context.globalOptions.coverage) {
+      const coverageLib = getCoverageLibrary();
+
       // NOTE: We check for a source name clash here. It could happen if the user
       // wanted to compile a source with our highly unlikely name by chance or
       // if we accidentally tried to preprocess the same solc input twice.
-      if (solcInput.sources[COVERAGE_LIBRARY_PATH] !== undefined) {
+      if (solcInput.sources[coverageLib.filename] !== undefined) {
         throw new HardhatError(
           HardhatError.ERRORS.CORE.COVERAGE.IMPORT_PATH_ALREADY_DEFINED,
           {
-            importPath: COVERAGE_LIBRARY_PATH,
+            importPath: coverageLib.filename,
           },
         );
       }
@@ -114,11 +111,9 @@ export default async (): Promise<Partial<SolidityHooks>> => ({
       // NOTE: We add the coverage.sol straight into sources here. The alternative
       // would be to do it during the resolution phase. However, we decided this
       // is a simpler solution, at least for now.
-      const packageRoot = await findClosestPackageRoot(import.meta.url);
-      const coverageSolPath = path.join(packageRoot, "coverage.sol");
-
-      const content = await readUtf8File(coverageSolPath);
-      solcInput.sources[COVERAGE_LIBRARY_PATH] = { content };
+      solcInput.sources[coverageLib.filename] = {
+        content: coverageLib.content,
+      };
     }
 
     return await next(context, solcInput);

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

@@ -2,7 +2,7 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 
 import { globalFlag } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:coverage",

package/src/internal/builtin-plugins/coverage/instrumentation.ts

@@ -20,8 +20,6 @@ import {
  * @param sourceName The source name of the file, as present in the compilation
  *  job.
  * @param fileContent The contents of the file.
- * @param coverageLibraryPath The path to the coverage library. i.e. where to
- *  import it from.
  * @returns An object with the instrumented source and its metadata, and the
  *  solidity version used to instrument the sources.
  */
@@ -29,12 +27,10 @@ export function instrumentSolidityFileForCompilationJob({
   compilationJobSolcVersion,
   sourceName,
   fileContent,
-  coverageLibraryPath,
 }: {
   compilationJobSolcVersion: string;
   sourceName: string;
   fileContent: string;
-  coverageLibraryPath: string;
 }): {
   source: string;
   metadata: InstrumentationMetadata[];
@@ -64,7 +60,6 @@ export function instrumentSolidityFileForCompilationJob({
     fileContent,
     sourceName,
     instrumentationVersion,
-    coverageLibraryPath,
   );
 
   return { source, metadata, instrumentationVersion };

package/src/internal/builtin-plugins/coverage/type-extensions.ts

@@ -1,4 +1,3 @@
-import "../../../types/global-options.js";
 declare module "../../../types/global-options.js" {
   export interface GlobalOptions {
     coverage: boolean;

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

@@ -3,7 +3,7 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 import { ArgumentType } from "../../../types/arguments.js";
 import { globalFlag, globalOption, overrideTask } from "../../core/config.js";
 
-import "./type-extensions.js";
+export type * from "./type-extensions.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:gas-analytics",

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

@@ -1,4 +1,3 @@
-import "../../../types/global-options.js";
 declare module "../../../types/global-options.js" {
   export interface GlobalOptions {
     gasStats: boolean;

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

@@ -14,21 +14,21 @@ import solidityTest from "./solidity-test/index.js";
 import telemetry from "./telemetry/index.js";
 import test from "./test/index.js";
 
-// Note: When importing a plugin, you have to export its types, so that its
-// type extensions, if any, also get loaded.
+// NOTE: We export the built-in plugin types to have a centralized way to
+// re-export them and force their type extensions to be loaded.
 export type * from "./artifacts/index.js";
-export type * from "./solidity/index.js";
-export type * from "./test/index.js";
-export type * from "./solidity-test/index.js";
-export type * from "./gas-analytics/index.js";
-export type * from "./network-manager/index.js";
 export type * from "./clean/index.js";
 export type * from "./console/index.js";
-export type * from "./run/index.js";
-export type * from "./node/index.js";
-export type * from "./flatten/index.js";
 export type * from "./coverage/index.js";
+export type * from "./flatten/index.js";
+export type * from "./gas-analytics/index.js";
+export type * from "./network-manager/index.js";
+export type * from "./node/index.js";
+export type * from "./run/index.js";
+export type * from "./solidity/index.js";
+export type * from "./solidity-test/index.js";
 export type * from "./telemetry/index.js";
+export type * from "./test/index.js";
 
 // This array should be kept in order, respecting the dependencies between the
 // plugins.

package/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts

@@ -29,24 +29,23 @@ export function createSolidityErrorWithStackTrace(
 ): SolidityError {
   const originalPrepareStackTrace = Error.prepareStackTrace;
 
+  assertHardhatInvariant(
+    originalPrepareStackTrace !== undefined,
+    "Error.prepareStackTrace should be defined",
+  );
+
   try {
     Error.prepareStackTrace = (error, stack) => {
       // Skip error management related stack traces
-      const adjustedStack = stack.slice(1);
+      const [, ...adjustedStack] = stack;
 
+      const prefix = [];
       for (const entry of stackTrace) {
         const callsite = encodeStackTraceEntry(entry);
-        if (callsite !== undefined) {
-          adjustedStack.unshift(callsite);
-        }
+        if (callsite !== undefined) prefix.push(callsite);
       }
-
-      assertHardhatInvariant(
-        originalPrepareStackTrace !== undefined,
-        "Error.prepareStackTrace should be defined",
-      );
-
-      return originalPrepareStackTrace(error, adjustedStack);
+      prefix.reverse();
+      return originalPrepareStackTrace(error, [...prefix, ...adjustedStack]);
     };
 
     const message =

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

@@ -3,10 +3,10 @@ import type { HardhatPlugin } from "../../../types/plugins.js";
 import { ArgumentType } from "../../../types/arguments.js";
 import { globalOption } from "../../core/config.js";
 
-import "./type-extensions/config.js";
-import "./type-extensions/global-options.js";
-import "./type-extensions/hooks.js";
-import "./type-extensions/hre.js";
+export type * from "./type-extensions/config.js";
+export type * from "./type-extensions/global-options.js";
+export type * from "./type-extensions/hooks.js";
+export type * from "./type-extensions/hre.js";
 
 const hardhatPlugin: HardhatPlugin = {
   id: "builtin:network-manager",

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

@@ -1,6 +1,5 @@
 import type { ChainType, DefaultChainType } from "../../../../types/network.js";
 
-import "../../../../types/config.js";
 declare module "../../../../types/config.js" {
   export interface HardhatUserConfig {
     chainDescriptors?: ChainDescriptorsUserConfig;

package/src/internal/builtin-plugins/network-manager/type-extensions/global-options.ts

@@ -1,4 +1,3 @@
-import "../../../../types/global-options.js";
 declare module "../../../../types/global-options.js" {
   export interface GlobalOptions {
     network: string;

package/src/internal/builtin-plugins/network-manager/type-extensions/hooks.ts

@@ -9,7 +9,6 @@ import type {
 import type { CoverageData } from "../../coverage/types.js";
 import type { GasMeasurement } from "../../gas-analytics/types.js";
 
-import "../../../../types/hooks.js";
 declare module "../../../../types/hooks.js" {
   export interface HardhatHooks {
     network: NetworkHooks;

package/src/internal/builtin-plugins/network-manager/type-extensions/hre.ts

@@ -1,6 +1,5 @@
 import type { NetworkManager } from "../../../../types/network.js";
 
-import "../../../../types/hre.js";
 declare module "../../../../types/hre.js" {
   export interface HardhatRuntimeEnvironment {
     network: NetworkManager;