Merge branch 'v-next' of github.com:NomicFoundation/hardhat into change-the-type-of-package-name

Author: ChristopherDedominici

.changeset/khaki-seahorses-develop.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Group `mocha` and `solidityTest` config under `test` property ([#7101](https://github.com/NomicFoundation/hardhat/pull/7101))

.changeset/proud-colts-itch.md

@@ -0,0 +1,5 @@
+---
+"hardhat": minor
+---
+
+Upgraded EDR dependency to @nomicfoundation/edr v0.12.0-next.3

.changeset/real-emus-begin.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Upgraded EDR dependency to @nomicfoundation/edr v0.12.0-next.2

.changeset/spicy-bugs-sit.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Added the addresses of created contracts in call traces

.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`.

pnpm-lock.yaml

@@ -207,6 +207,14 @@ const config: HardhatUserConfig = {
   typechain: {
     tsNocheck: false,
   },
+  test: {
+    mocha: {
+      color: true,
+    },
+    solidity: {
+      timeout: 1000,
+    },
+  },
 };
 
 export default config;

v-next/example-project/hardhat.config.ts

@@ -73,7 +73,11 @@ const mochaConfigType = z.object({
 });
 
 const userConfigType = z.object({
-  mocha: z.optional(mochaConfigType),
+  test: z
+    .object({
+      mocha: z.optional(mochaConfigType),
+    })
+    .optional(),
   paths: z
     .object({
       test: conditionalUnionType(
@@ -110,10 +114,13 @@ export default async (): Promise<Partial<ConfigHooks>> => {
 
       return {
         ...resolvedConfig,
-        mocha: {
-          timeout: 40000,
-          ...resolvedConfig.mocha,
-          ...userConfig.mocha,
+        test: {
+          ...resolvedConfig.test,
+          mocha: {
+            timeout: 40000,
+            ...resolvedConfig.test.mocha,
+            ...userConfig.test?.mocha,
+          },
         },
         paths: {
           ...resolvedConfig.paths,

v-next/hardhat-mocha/src/hookHandlers/config.ts

@@ -67,7 +67,7 @@ const testWithHardhat: NewTaskActionFunction<TestActionArguments> = async (
 
   const { default: Mocha } = await import("mocha");
 
-  const mochaConfig: MochaOptions = { ...hre.config.mocha };
+  const mochaConfig: MochaOptions = { ...hre.config.test.mocha };
 
   if (grep !== "") {
     mochaConfig.grep = grep;

v-next/hardhat-mocha/src/task-action.ts

@@ -3,19 +3,22 @@ import "hardhat/types/config";
 import type { MochaOptions } from "mocha";
 
 declare module "hardhat/types/config" {
-  export interface HardhatUserConfig {
-    mocha?: MochaOptions;
-  }
-
   export interface TestPathsUserConfig {
     mocha?: string;
   }
 
-  export interface HardhatConfig {
-    mocha: MochaOptions;
-  }
-
   export interface TestPathsConfig {
     mocha: string;
   }
 }
+
+import "hardhat/types/test";
+declare module "hardhat/types/test" {
+  export interface HardhatTestUserConfig {
+    mocha?: MochaOptions;
+  }
+
+  export interface HardhatTestConfig {
+    mocha: MochaOptions;
+  }
+}