feat: add mergeCompilationJobs and concurrency to build profile config

Author: galargh

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

@@ -36,7 +36,10 @@ import debug from "debug";
 import pMap from "p-map";
 
 import { FileBuildResultType } from "../../../../types/solidity/build-system.js";
-import { DEFAULT_BUILD_PROFILE, shouldMergeCompilationJobs } from "../build-profiles.js";
+import {
+  DEFAULT_BUILD_PROFILE,
+  shouldMergeCompilationJobs,
+} from "../build-profiles.js";
 
 import {
   getArtifactsDeclarationFile,
@@ -139,6 +142,14 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       ),
     );
 
+    const buildProfileName = options?.buildProfile ?? DEFAULT_BUILD_PROFILE;
+    const buildProfile =
+      this.#options.solidityConfig.profiles[buildProfileName];
+    const concurrency =
+      options?.concurrency ??
+      buildProfile.concurrency ??
+      this.#defaultConcurrency;
+
     const runCompilationJobOptions: RunCompilationJobOptions = {
       quiet: options?.quiet,
     };
@@ -172,7 +183,7 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
         };
       },
       {
-        concurrency: options?.concurrency ?? this.#defaultConcurrency,
+        concurrency,
         // An error when running the compiler is not a compilation failure, but
         // a fatal failure trying to run it, so we just throw on the first error
         stopOnError: true,
@@ -308,9 +319,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
 
     log(`Using build profile ${buildProfileName}`);
 
+    const buildProfile =
+      this.#options.solidityConfig.profiles[buildProfileName];
+
     const solcConfigSelector = new SolcConfigSelector(
       buildProfileName,
-      this.#options.solidityConfig.profiles[buildProfileName],
+      buildProfile,
       dependencyGraph,
     );
 
@@ -334,7 +348,12 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
       subgraphsWithConfig.push([configOrError, subgraph]);
     }
 
-    if (options?.mergeCompilationJobs ?? shouldMergeCompilationJobs(buildProfileName)) {
+    const mergeCompilationJobs =
+      options?.mergeCompilationJobs ??
+      buildProfile?.mergeCompilationJobs ??
+      shouldMergeCompilationJobs(buildProfileName);
+
+    if (mergeCompilationJobs) {
       log(`Merging compilation jobs`);
 
       const mergedSubgraphsByConfig: Map<

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

@@ -282,6 +282,8 @@ function resolveSolidityConfig(
           },
         ],
         overrides: {},
+        mergeCompilationJobs: profile.mergeCompilationJobs,
+        concurrency: profile.concurrency,
       };
       continue;
     }
@@ -304,6 +306,8 @@ function resolveSolidityConfig(
           },
         ),
       ),
+      mergeCompilationJobs: profile.mergeCompilationJobs,
+      concurrency: profile.concurrency,
     };
   }
 

v-next/hardhat/src/internal/builtin-plugins/solidity/type-extensions.ts

@@ -15,10 +15,17 @@ declare module "../../../types/config.js" {
     settings?: any;
   }
 
+  export interface CommonSolcUserConfig {
+    mergeCompilationJobs?: boolean;
+    concurrency?: number;
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-empty-interface -- This could be an extension point
-  export interface SingleVersionSolcUserConfig extends SolcUserConfig {}
+  export interface SingleVersionSolcUserConfig
+    extends SolcUserConfig,
+      CommonSolcUserConfig {}
 
-  export interface MultiVersionSolcUserConfig {
+  export interface MultiVersionSolcUserConfig extends CommonSolcUserConfig {
     compilers: SolcUserConfig[];
     overrides?: Record<string, SolcUserConfig>;
   }
@@ -36,12 +43,13 @@ declare module "../../../types/config.js" {
     extends MultiVersionSolcUserConfig,
       CommonSolidityUserConfig {}
 
+  export type SolidityBuildProfileUserConfig =
+    | SingleVersionSolcUserConfig
+    | MultiVersionSolcUserConfig;
+
   export interface BuildProfilesSolidityUserConfig
     extends CommonSolidityUserConfig {
-    profiles: Record<
-      string,
-      SingleVersionSolcUserConfig | MultiVersionSolcUserConfig
-    >;
+    profiles: Record<string, SolidityBuildProfileUserConfig>;
   }
 
   export interface HardhatUserConfig {
@@ -56,6 +64,8 @@ declare module "../../../types/config.js" {
   export interface SolidityBuildProfileConfig {
     compilers: SolcConfig[];
     overrides: Record<string, SolcConfig>;
+    mergeCompilationJobs?: boolean;
+    concurrency?: number;
   }
 
   export interface SolidityConfig {