Merge pull request #7102 from NomicFoundation/chore/bump-edr

kanej · web-flow · commit 4ccbe1af99b9 · 2025-08-04T17:03:33.000Z
Upgrade to @NomicFoundation/edr v0.12.0-next.3 and add created address in trace
diff --git a/.changeset/proud-colts-itch.md b/.changeset/proud-colts-itch.md
@@ -0,0 +1,5 @@
+---
+"hardhat": minor
+---
+
+Upgraded EDR dependency to @nomicfoundation/edr v0.12.0-next.3
diff --git a/.changeset/real-emus-begin.md b/.changeset/real-emus-begin.md
@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Upgraded EDR dependency to @nomicfoundation/edr v0.12.0-next.2
diff --git a/.changeset/spicy-bugs-sit.md b/.changeset/spicy-bugs-sit.md
@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Added the addresses of created contracts in call traces
diff --git a/.changeset/spotty-pianos-confess.md b/.changeset/spotty-pianos-confess.md
@@ -0,0 +1,5 @@
+---
+"hardhat": minor
+---
+
+Removed deprecated JSON-RPC methods: `eth_mining`, `net_listening`, `net_peerCount`, `hardhat_addCompilationResult`, `hardhat_intervalMine`, and `hardhat_reset`.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/v-next/hardhat/package.json b/v-next/hardhat/package.json
@@ -85,7 +85,7 @@
     "typescript": "~5.8.0"
   },
   "dependencies": {
-    "@nomicfoundation/edr": "0.12.0-next.1",
+    "@nomicfoundation/edr": "0.12.0-next.3",
     "@nomicfoundation/hardhat-errors": "workspace:^3.0.0-next.26",
     "@nomicfoundation/hardhat-utils": "workspace:^3.0.0-next.26",
     "@nomicfoundation/hardhat-zod-utils": "workspace:^3.0.0-next.26",
diff --git a/v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.ts b/v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.ts
@@ -24,6 +24,7 @@ import type {
   ContractTooLargeErrorStackTraceEntry,
   InternalFunctionCallStackEntry,
   ContractCallRunOutOfGasError,
+  CheatcodeErrorStackTraceEntry,
 } from "@nomicfoundation/edr";
 
 import {
@@ -102,6 +103,7 @@ export type SolidityStackTraceEntry =
   | UnmappedSolc063RevertErrorStackTraceEntry
   | ContractTooLargeErrorStackTraceEntry
   | InternalFunctionCallStackEntry
-  | ContractCallRunOutOfGasError;
+  | ContractCallRunOutOfGasError
+  | CheatcodeErrorStackTraceEntry;
 
 export type SolidityStackTrace = SolidityStackTraceEntry[];
diff --git a/v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts b/v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts
@@ -89,6 +89,7 @@ export function encodeStackTraceEntry(
     case StackTraceEntryType.RETURNDATA_SIZE_ERROR:
     case StackTraceEntryType.NONCONTRACT_ACCOUNT_CALLED_ERROR:
     case StackTraceEntryType.CALL_FAILED_ERROR:
+    case StackTraceEntryType.CHEATCODE_ERROR:
     case StackTraceEntryType.DIRECT_LIBRARY_CALL_ERROR:
       return sourceReferenceToSolidityCallsite(stackTraceEntry.sourceReference);
 
@@ -265,6 +266,7 @@ function getMessageFromLastStackTraceEntry(
       return `VM Exception while processing transaction: ${panicMessage}`;
 
     case StackTraceEntryType.CUSTOM_ERROR:
+    case StackTraceEntryType.CHEATCODE_ERROR:
       return `VM Exception while processing transaction: ${stackTraceEntry.message}`;
 
     case StackTraceEntryType.OTHER_EXECUTION_ERROR:
diff --git a/v-next/hardhat/src/internal/builtin-plugins/solidity-test/formatters.ts b/v-next/hardhat/src/internal/builtin-plugins/solidity-test/formatters.ts
@@ -109,6 +109,7 @@ function formatTrace(
 ): NestedArray<string> {
   const {
     success,
+    address,
     contract,
     inputs,
     gasUsed,
@@ -132,15 +133,15 @@ function formatTrace(
   let openingLine: string;
   let closingLine: string | undefined;
   if (kind === CallKind.Create) {
-    openingLine = `[${gasUsed}] ${colorizer.yellow("→ new")} ${contract}`;
+    openingLine = `[${gasUsed}] ${colorizer.yellow("→ new")} ${contract ?? "<unknown>"}@${address}`;
     // TODO: Uncomment this when the formattedInputs starts containing
     // the address of where the contract was deployed instead of the code.
     // if (formattedInputs !== undefined) {
     //   openingLine = `${openingLine}@${formattedInputs}`;
     // }
   } else {
     const formattedKind = formatKind(kind);
-    openingLine = `[${gasUsed}] ${color(contract)}`;
+    openingLine = `[${gasUsed}] ${color(contract ?? address)}`;
     if (formattedInputs !== undefined) {
       openingLine = `${openingLine}::${formattedInputs}`;
     }
diff --git a/v-next/hardhat/src/internal/builtin-plugins/solidity-test/stack-trace-solidity-errors.ts b/v-next/hardhat/src/internal/builtin-plugins/solidity-test/stack-trace-solidity-errors.ts
@@ -63,6 +63,9 @@ export function getMessageFromLastStackTraceEntry(
     case StackTraceEntryType.CUSTOM_ERROR:
       return stackTraceEntry.message;
 
+    case StackTraceEntryType.CHEATCODE_ERROR:
+      return stackTraceEntry.message;
+
     case StackTraceEntryType.CONTRACT_TOO_LARGE_ERROR:
       return "Trying to deploy a contract whose code is too large";
 
diff --git a/v-next/hardhat/test/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts b/v-next/hardhat/test/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts
@@ -1,3 +1,8 @@
+import type {
+  SolidityStackTraceEntry,
+  StackTraceEntryType,
+} from "../../../../../../src/internal/builtin-plugins/network-manager/edr/stack-traces/solidity-stack-trace.js";
+
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 
@@ -37,5 +42,19 @@ describe("SolidityCallSite", function () {
 
       assert.equal(callSite.toString(), "Contract.functionName (Source.sol:1)");
     });
+
+    it("exhaustive stack trace entries", async () => {
+      // This is a type-only test to ensure that the SolidityStackTraceEntry union type
+      // includes all the expected variants.
+      const hhEntryType = (_entryType: SolidityStackTraceEntry["type"]) => {};
+      const edrEntryType = (_entryType: StackTraceEntryType) => {};
+
+      const _test1 = (entryType: SolidityStackTraceEntry["type"]) => {
+        edrEntryType(entryType);
+      };
+      const _test2 = (entryType: StackTraceEntryType) => {
+        hhEntryType(entryType);
+      };
+    });
   });
 });
diff --git a/v-next/hardhat/test/internal/builtin-plugins/solidity-test/formatters.ts b/v-next/hardhat/test/internal/builtin-plugins/solidity-test/formatters.ts
@@ -43,6 +43,7 @@ describe("formatTraces", () => {
         isCheatcode: false,
         gasUsed: 127552n,
         value: 0n,
+        address: "0x9Cded789F1564C12102E41634157434dd1De9fE3",
         contract: "FailingCounterTest",
         inputs: { name: "setUp", arguments: [] },
         outputs: new Uint8Array(),
@@ -53,6 +54,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 0n,
             value: 0n,
+            address: "0x7c926CE5743033Cbe6f6cF7D6622EF70e05503A6",
             contract: "console",
             inputs: { name: "log", arguments: ['"Setting up"'] },
             outputs: new Uint8Array(),
@@ -64,6 +66,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 68915n,
             value: 0n,
+            address: "0x373b22261122919Ad39F55ac0475dd0f82Bd2499",
             contract: "Counter",
             inputs: new Uint8Array([1, 2, 3]),
             outputs: "344 bytes of code",
@@ -75,6 +78,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 0n,
             value: 0n,
+            address: "0x7c926CE5743033Cbe6f6cF7D6622EF70e05503A6",
             contract: "console",
             inputs: { name: "log", arguments: ['"Counter set up"'] },
             outputs: new Uint8Array(),
@@ -88,6 +92,7 @@ describe("formatTraces", () => {
         isCheatcode: false,
         gasUsed: 32272n,
         value: 0n,
+        address: "0x9Cded789F1564C12102E41634157434dd1De9fE3",
         contract: "FailingCounterTest",
         inputs: { name: "testFailFuzzInc", arguments: ["1"] },
         outputs: new Uint8Array(),
@@ -98,6 +103,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 0n,
             value: 0n,
+            address: "0x7c926CE5743033Cbe6f6cF7D6622EF70e05503A6",
             contract: "console",
             inputs: { name: "log", arguments: ['"Fuzz testing inc fail"'] },
             outputs: new Uint8Array(),
@@ -109,6 +115,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 22397n,
             value: 0n,
+            address: "0x373b22261122919Ad39F55ac0475dd0f82Bd2499",
             contract: "Counter",
             inputs: { name: "inc", arguments: [] },
             outputs: new Uint8Array(),
@@ -120,6 +127,7 @@ describe("formatTraces", () => {
             isCheatcode: false,
             gasUsed: 402n,
             value: 0n,
+            address: "0x373b22261122919Ad39F55ac0475dd0f82Bd2499",
             contract: "Counter",
             inputs: { name: "x", arguments: [] },
             outputs: "1",
@@ -132,7 +140,7 @@ describe("formatTraces", () => {
     const expected = `
 [127552] ${chalk.green("FailingCounterTest")}::${chalk.green("setUp")}()
   ├─ [0] ${chalk.green("console")}::${chalk.green("log")}("Setting up") ${chalk.yellow("[staticcall]")}
-  ├─ [68915] ${chalk.yellow("→ new")} Counter
+  ├─ [68915] ${chalk.yellow("→ new")} Counter@0x373b22261122919Ad39F55ac0475dd0f82Bd2499
   │    └─ ${chalk.green("←")} 344 bytes of code
   └─ [0] ${chalk.green("console")}::${chalk.green("log")}("Counter set up") ${chalk.yellow("[staticcall]")}
 [32272] ${chalk.green("FailingCounterTest")}::${chalk.green("testFailFuzzInc")}(1)
diff --git a/v-next/hardhat/test/internal/builtin-plugins/solidity-test/reporter.ts b/v-next/hardhat/test/internal/builtin-plugins/solidity-test/reporter.ts
@@ -116,6 +116,7 @@ const mocker = {
       isCheatcode: false,
       gasUsed: trace.gasUsed,
       value: 0n,
+      address: "0x7c926CE5743033Cbe6f6cF7D6622EF70e05503A6",
       contract: trace.contract,
       inputs: new Uint8Array(),
       outputs: new Uint8Array(),

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"hardhat": minor
 +---
++
 +Upgraded EDR dependency to @nomicfoundation/edr v0.12.0-next.3