Merge branch 'v-next' into contributing-update-v3

Author: michalbrabec

.changeset/forty-steaks-live.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Stop solidity tests being recompiled unnecessarily ([#7116](https://github.com/NomicFoundation/hardhat/issues/7116))

.changeset/strong-actors-count.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Send selected project type to GA

v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts

@@ -84,6 +84,7 @@ export interface SolidityBuildSystemOptions {
   readonly soliditySourcesPaths: string[];
   readonly artifactsPath: string;
   readonly cachePath: string;
+  readonly solidityTestsPath: string;
 }
 
 export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
@@ -290,6 +291,8 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     rootFilePaths: string[],
     options?: GetCompilationJobsOptions,
   ): Promise<CompilationJobCreationError | GetCompilationJobsResult> {
+    const isolated = options?.isolated ?? false;
+
     await this.#downloadConfiguredCompilers(options?.quiet);
 
     const dependencyGraph = await buildDependencyGraph(
@@ -397,7 +400,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
         options?.force === true ||
         cacheResult === undefined ||
         cacheResult.jobHash !== jobHash ||
-        cacheResult.isolated !== options?.isolated
+        cacheResult.isolated !== isolated
       ) {
         rootFilesToCompile.add(rootFile);
         continue;
@@ -424,10 +427,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       }
     }
 
-    if (
-      options?.isolated !== true &&
-      shouldMergeCompilationJobs(buildProfileName)
-    ) {
+    if (!isolated && shouldMergeCompilationJobs(buildProfileName)) {
       // non-isolated mode
       log(`Merging compilation jobs`);
 
@@ -702,6 +702,20 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
     )) {
       const relativePath = path.relative(this.#options.artifactsPath, file);
 
+      const testDirectorySubpath = path.relative(
+        this.#options.projectRoot,
+        this.#options.solidityTestsPath,
+      );
+      const hasTestFileExtension = file.endsWith(".t.sol");
+      const isInsideTestFolder = relativePath.startsWith(
+        testDirectorySubpath + path.sep,
+      );
+
+      // Skip test artifacts, since our full compilation doesn't include them, they would incorrectly be marked for deletion
+      if (hasTestFileExtension || isInsideTestFolder) {
+        continue;
+      }
+
       if (!userSourceNamesSet.has(relativePath)) {
         await remove(file);
       }

v-next/hardhat/src/internal/builtin-plugins/solidity/hook-handlers/hre.ts

@@ -120,6 +120,7 @@ export default async (): Promise<Partial<HardhatRuntimeEnvironmentHooks>> => {
         soliditySourcesPaths: hre.config.paths.sources.solidity,
         artifactsPath: hre.config.paths.artifacts,
         cachePath: hre.config.paths.cache,
+        solidityTestsPath: hre.config.paths.tests.solidity,
       });
     },
   };

v-next/hardhat/src/internal/cli/init/init.ts

@@ -24,6 +24,7 @@ import * as semver from "semver";
 import { findClosestHardhatConfig } from "../../config-loading.js";
 import { HARDHAT_NAME } from "../../constants.js";
 import { getHardhatVersion } from "../../utils/package.js";
+import { sendProjectTypeAnalytics } from "../telemetry/analytics/analytics.js";
 
 import {
   getDevDependenciesInstallationCommand,
@@ -96,7 +97,10 @@ export async function initHardhat(options?: InitHardhatOptions): Promise<void> {
 
     // Ask the user for the template to use for the project initialization
     // if it was not provided, and validate that it exists
-    const template = await getTemplate(hardhatVersion, options?.template);
+    const [template, projectTypeAnalyticsPromise] = await getTemplate(
+      hardhatVersion,
+      options?.template,
+    );
 
     // Create the package.json file if it does not exist
     // and validate that it is an esm package
@@ -112,7 +116,11 @@ export async function initHardhat(options?: InitHardhatOptions): Promise<void> {
 
     // Print the commands to install the project dependencies
     // Run them only if the user opts-in to it
-    await installProjectDependencies(workspace, template, options?.install);
+    // Concurrently, await the analytics hit
+    await Promise.all([
+      installProjectDependencies(workspace, template, options?.install),
+      projectTypeAnalyticsPromise,
+    ]);
 
     showStarOnGitHubMessage();
   } catch (e) {
@@ -241,26 +249,34 @@ export async function getWorkspace(workspace?: string): Promise<string> {
  * NOTE: This function is exported for testing purposes
  *
  * @param template The name of the template to use for the project initialization.
- * @returns
+ * @returns A tuple with two elements: the template and a promise with the analytics hit.
  */
 export async function getTemplate(
   hardhatVersion: "hardhat-2" | "hardhat-3",
   template?: string,
-): Promise<Template> {
+): Promise<[Template, Promise<boolean>]> {
   const templates = await getTemplates(hardhatVersion);
 
   // Ask the user for the template to use for the project initialization if it was not provided
   if (template === undefined) {
     template = await promptForTemplate(templates);
   }
 
+  const projectTypeAnalyticsPromise = sendProjectTypeAnalytics(
+    hardhatVersion,
+    template,
+  );
+
   // Validate that the template exists
   for (const t of templates) {
     if (t.name === template) {
-      return t;
+      return [t, projectTypeAnalyticsPromise];
     }
   }
 
+  // we wait for the GA hit before throwing
+  await projectTypeAnalyticsPromise;
+
   throw new HardhatError(HardhatError.ERRORS.CORE.GENERAL.TEMPLATE_NOT_FOUND, {
     template,
   });

v-next/hardhat/src/internal/cli/telemetry/analytics/analytics.ts

@@ -1,7 +1,6 @@
 import type {
-  EventNames,
+  AnalyticsEvent,
   Payload,
-  TaskParams,
   TelemetryConfigPayload,
 } from "./types.js";
 
@@ -54,23 +53,38 @@ export async function sendTelemetryConfigAnalytics(
 }
 
 export async function sendTaskAnalytics(taskId: string[]): Promise<boolean> {
-  const eventParams: TaskParams = {
-    task: taskId.join(", "),
+  const taskAnalyticsEvent: AnalyticsEvent = {
+    name: "task",
+    params: {
+      task: taskId.join(", "),
+    },
   };
 
-  return sendAnalytics("task", eventParams);
+  return sendAnalytics(taskAnalyticsEvent);
 }
 
-// Return a boolean for testing purposes to confirm whether analytics were sent based on the consent value and not in CI environments
-async function sendAnalytics(
-  eventName: EventNames,
-  eventParams: TaskParams,
+export async function sendProjectTypeAnalytics(
+  hardhatVersion: "hardhat-2" | "hardhat-3",
+  template: string,
 ): Promise<boolean> {
+  const initAnalyticsEvent: AnalyticsEvent = {
+    name: "init",
+    params: {
+      hardhatVersion,
+      template,
+    },
+  };
+
+  return sendAnalytics(initAnalyticsEvent);
+}
+
+// Return a boolean for testing purposes to confirm whether analytics were sent based on the consent value and not in CI environments
+async function sendAnalytics(analyticsEvent: AnalyticsEvent): Promise<boolean> {
   if (!(await isTelemetryAllowed())) {
     return false;
   }
 
-  const payload = await buildPayload(eventName, eventParams);
+  const payload = await buildPayload(analyticsEvent);
 
   await createSubprocessToSendAnalytics(payload);
 
@@ -104,10 +118,7 @@ async function createSubprocessToSendAnalytics(
   log("Payload sent to detached subprocess");
 }
 
-async function buildPayload(
-  eventName: EventNames,
-  eventParams: TaskParams,
-): Promise<Payload> {
+async function buildPayload(analyticsEvent: AnalyticsEvent): Promise<Payload> {
   const clientId = await getAnalyticsClientId();
 
   return {
@@ -121,11 +132,11 @@ async function buildPayload(
     },
     events: [
       {
-        name: eventName,
+        name: analyticsEvent.name,
         params: {
           engagement_time_msec: ENGAGEMENT_TIME_MSEC,
           session_id: SESSION_ID,
-          ...eventParams,
+          ...analyticsEvent.params,
         },
       },
     ],

v-next/hardhat/src/internal/cli/telemetry/analytics/types.ts

@@ -32,11 +32,20 @@ export interface TelemetryConfigPayload extends BasePayload {
   }>;
 }
 
-export type EventNames = "task";
-
-export interface TaskParams {
-  task: string;
-}
+export type AnalyticsEvent =
+  | {
+      name: "task";
+      params: {
+        task: string;
+      };
+    }
+  | {
+      name: "init";
+      params: {
+        hardhatVersion: "hardhat-2" | "hardhat-3";
+        template: string;
+      };
+    };
 
 export interface Payload extends BasePayload {
   user_properties: {
@@ -54,10 +63,10 @@ export interface Payload extends BasePayload {
     };
   };
   events: Array<{
-    name: EventNames;
+    name: AnalyticsEvent["name"];
     params: {
       engagement_time_msec: string;
       session_id: string;
-    } & TaskParams;
+    } & AnalyticsEvent["params"];
   }>;
 }

v-next/hardhat/test/internal/builtin-plugins/solidity/build-system/build-system.ts

@@ -107,6 +107,7 @@ describe(
         soliditySourcesPaths: [path.join(process.cwd(), "contracts")],
         artifactsPath: expectedArtifactsPath,
         cachePath: expectedCachePath,
+        solidityTestsPath: path.join(process.cwd(), "tests"),
       });
       const rootFilePaths = await solidity.getRootFilePaths();
       await solidity.build(rootFilePaths, {
@@ -129,6 +130,7 @@ describe(
         soliditySourcesPaths: [path.join(process.cwd(), "contracts")],
         artifactsPath: actualArtifactsPath,
         cachePath: actualCachePath,
+        solidityTestsPath: path.join(process.cwd(), "tests"),
       });
     });
 

v-next/hardhat/test/internal/cli/init/init.ts

@@ -90,7 +90,7 @@ describe("getTemplate", () => {
     );
   });
   it("should return the provided template", async () => {
-    const template = await getTemplate("hardhat-3", "mocha-ethers");
+    const [template] = await getTemplate("hardhat-3", "mocha-ethers");
     assert.equal(template.name, "mocha-ethers");
   });
 });
@@ -284,7 +284,7 @@ describe("copyProjectFiles", () => {
 
   describe("when force is true", () => {
     it("should copy the template files to the workspace and overwrite existing files", async () => {
-      const template = await getTemplate("hardhat-3", "mocha-ethers");
+      const [template] = await getTemplate("hardhat-3", "mocha-ethers");
       // Create template files with "some content" in the workspace
       const workspaceFiles = template.files.map(
         relativeTemplateToWorkspacePath,
@@ -303,7 +303,7 @@ describe("copyProjectFiles", () => {
       }
     });
     it("should copy the .gitignore file correctly", async () => {
-      const template = await getTemplate("hardhat-3", "mocha-ethers");
+      const [template] = await getTemplate("hardhat-3", "mocha-ethers");
       // Copy the template files to the workspace
       await copyProjectFiles(process.cwd(), template, true);
       // Check that the .gitignore exists but gitignore does not
@@ -319,7 +319,7 @@ describe("copyProjectFiles", () => {
   });
   describe("when force is false", () => {
     it("should copy the template files to the workspace and NOT overwrite existing files", async () => {
-      const template = await getTemplate("hardhat-3", "mocha-ethers");
+      const [template] = await getTemplate("hardhat-3", "mocha-ethers");
       // Create template files with "some content" in the workspace
       const workspaceFiles = template.files.map(
         relativeTemplateToWorkspacePath,
@@ -338,7 +338,7 @@ describe("copyProjectFiles", () => {
       }
     });
     it("should copy the .gitignore file correctly", async () => {
-      const template = await getTemplate("hardhat-3", "mocha-ethers");
+      const [template] = await getTemplate("hardhat-3", "mocha-ethers");
       // Copy the template files to the workspace
       await copyProjectFiles(process.cwd(), template, false);
       // Check that the .gitignore exists but gitignore does not
@@ -396,7 +396,7 @@ describe("installProjectDependencies", async () => {
   }
 
   it("should not install any template dependencies if the user opts-out of the installation", async () => {
-    const template = await getTemplate("hardhat-3", "mocha-ethers");
+    const [template] = await getTemplate("hardhat-3", "mocha-ethers");
     await writeUtf8File("package.json", JSON.stringify({ type: "module" }));
     await installProjectDependencies(process.cwd(), template, false, false);
     assert.ok(!(await exists("node_modules")), "node_modules should not exist");
@@ -412,7 +412,7 @@ describe("installProjectDependencies", async () => {
         process.env.GITHUB_HEAD_REF?.startsWith("changeset-release/"),
     },
     async () => {
-      const template = await getTemplate("hardhat-3", "mocha-ethers");
+      const [template] = await getTemplate("hardhat-3", "mocha-ethers");
       await writeUtf8File(
         "package.json",
         JSON.stringify({