hardhat 3.4.2 → 3.4.3

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

@@ -7,7 +7,9 @@ import type {
 import type { TableItem } from "@nomicfoundation/hardhat-utils/format";
 
 import path from "node:path";
+import { styleText } from "node:util";
 
+import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
 import { formatTable } from "@nomicfoundation/hardhat-utils/format";
 import {
   ensureDir,
@@ -18,13 +20,11 @@ import {
   writeJsonFile,
   writeUtf8File,
 } from "@nomicfoundation/hardhat-utils/fs";
-import chalk from "chalk";
-import debug from "debug";
 
 import { getProcessedCoverageInfo } from "./process-coverage.js";
 import { generateHtmlReport } from "./reports/html.js";
 
-const log = debug("hardhat:core:coverage:coverage-manager");
+const log = createDebug("hardhat:core:coverage:coverage-manager");
 
 const MAX_COLUMN_WIDTH = 80;
 
@@ -435,18 +435,18 @@ export class CoverageManagerImplementation implements CoverageManager {
 
     rows.push({
       type: "title",
-      text: chalk.bold("Coverage Report"),
+      text: styleText("bold", "Coverage Report"),
     });
 
     rows.push({
       type: "section-header",
-      text: chalk.bold("File Coverage"),
+      text: styleText("bold", "File Coverage"),
     });
 
     rows.push({
       type: "header",
       cells: ["File Path", "Line %", "Statement %", "Uncovered Lines"].map(
-        (s) => chalk.yellow(s),
+        (s) => styleText("yellow", s),
       ),
     });
 
@@ -500,7 +500,7 @@ export class CoverageManagerImplementation implements CoverageManager {
     rows.push({
       type: "header",
       cells: [
-        chalk.yellow("Total"),
+        styleText("yellow", "Total"),
         this.formatCoverage(totalLineCoverage),
         this.formatCoverage(totalStatementCoverage),
         "",

package/src/internal/builtin-plugins/coverage/helpers/accessors.ts

@@ -2,7 +2,7 @@
 // handler and task-actions that may run on every `hardhat test` invocation
 // regardless of whether the feature is enabled. It must stay lightweight:
 // do not add top-level imports that pull in the coverage-manager module
-// graph (chalk, debug, node:crypto, file-system traversal, etc.), or the
+// graph (debug, node:crypto, file-system traversal, etc.), or the
 // `--coverage` lazy-load is silently defeated for every caller.
 // If a new helper needs a heavy dependency, put it in a sibling file
 // (e.g. `helpers/utils.ts`) so the accessors file's import cost stays flat.

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

@@ -4,15 +4,15 @@ import type { CoverageMetadata } from "../types.js";
 import path from "node:path";
 
 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 debug from "debug";
 
 import { getCoverageManager } from "../helpers/accessors.js";
 import { instrumentSolidityFileForCompilationJob } from "../instrumentation.js";
 
-const log = debug("hardhat:core:coverage:hook-handlers:solidity");
+const log = createDebug("hardhat:core:coverage:hook-handlers:solidity");
 
 const COVERAGE_LIBRARY_PATH =
   "__hardhat_coverage_library_a3e9cfe2-41b4-4a1f-ad9e-ac62dd82979e.sol";

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

@@ -4,7 +4,11 @@ import {
   addStatementCoverageInstrumentation,
   latestSupportedSolidityVersion,
 } from "@nomicfoundation/edr";
-import { satisfies } from "semver";
+import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
+import {
+  lowerThanOrEqual,
+  parseVersion,
+} from "@nomicfoundation/hardhat-utils/fast-semver";
 
 /**
  * Instruments a solidity source file as part of a compilation job. i.e. the
@@ -37,8 +41,23 @@ export function instrumentSolidityFileForCompilationJob({
   instrumentationVersion: string;
 } {
   const latestSupportedVersion = latestSupportedSolidityVersion();
+  const parsedLatestSupportedVersion = parseVersion(latestSupportedVersion);
+  assertHardhatInvariant(
+    parsedLatestSupportedVersion !== undefined,
+    `Invalid latest supported solidity version: ${latestSupportedVersion}`,
+  );
   let instrumentationVersion = compilationJobSolcVersion;
-  if (!satisfies(instrumentationVersion, `<=${latestSupportedVersion}`)) {
+  const parsedInstrumentationVersion = parseVersion(instrumentationVersion);
+  assertHardhatInvariant(
+    parsedInstrumentationVersion !== undefined,
+    `Invalid solc version: ${instrumentationVersion}`,
+  );
+  if (
+    !lowerThanOrEqual(
+      parsedInstrumentationVersion,
+      parsedLatestSupportedVersion,
+    )
+  ) {
     instrumentationVersion = latestSupportedVersion;
   }
   const { source, metadata } = addStatementCoverageInstrumentation(

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

@@ -4,7 +4,7 @@ import type {
   Statement,
 } from "./types.js";
 
-import chalk from "chalk";
+import { styleText } from "node:util";
 
 // Use constants for the Uint8Array to improve memory usage (1 byte vs 8 bytes per item)
 const STATUS_NOT_EXECUTED = 0; // equivalent to false
@@ -399,7 +399,7 @@ function printStatementsForDebugging(
     console.debug(counter++ + " ---");
 
     for (let i = statement.startUtf16; i < statement.endUtf16; i++) {
-      process.stdout.write(chalk.gray(fileContent[i]));
+      process.stdout.write(styleText("gray", fileContent[i]));
     }
 
     console.debug();
@@ -413,7 +413,7 @@ function printStatementsForDebugging(
     console.debug(counter++ + " ---");
 
     for (let i = statement.startUtf16; i < statement.endUtf16; i++) {
-      process.stdout.write(chalk.gray(fileContent[i]));
+      process.stdout.write(styleText("gray", fileContent[i]));
     }
 
     console.debug();
@@ -432,11 +432,11 @@ function printCharacterCoverageForDebugging(
 ): void {
   for (let i = 0; i < characterCoverage.length; i++) {
     if (characterCoverage[i] === STATUS_IGNORED) {
-      process.stdout.write(chalk.gray(fileContent[i]));
+      process.stdout.write(styleText("gray", fileContent[i]));
     } else if (characterCoverage[i] === STATUS_EXECUTED) {
-      process.stdout.write(chalk.green(fileContent[i]));
+      process.stdout.write(styleText("green", fileContent[i]));
     } else {
-      process.stdout.write(chalk.red(fileContent[i]));
+      process.stdout.write(styleText("red", fileContent[i]));
     }
   }
 }

package/src/internal/builtin-plugins/flatten/task-action.ts

@@ -1,7 +1,8 @@
 import type { NewTaskActionFunction } from "../../../types/tasks.js";
 
+import { styleText } from "node:util";
+
 import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
-import chalk from "chalk";
 
 import {
   ResolvedFileType,
@@ -108,7 +109,8 @@ const flattenAction: NewTaskActionFunction<FlattenActionArguments> = async (
 
   if (filesWithoutLicenses.length > 0) {
     warn(
-      chalk.yellow(
+      styleText(
+        "yellow",
         `\nThe following file(s) do NOT specify SPDX licenses: ${filesWithoutLicenses.join(
           ", ",
         )}`,
@@ -118,7 +120,8 @@ const flattenAction: NewTaskActionFunction<FlattenActionArguments> = async (
 
   if (pragmaDirective !== "" && filesWithoutPragmaDirectives.length > 0) {
     warn(
-      chalk.yellow(
+      styleText(
+        "yellow",
         `\nPragma abicoder directives are defined in some files, but they are not defined in the following ones: ${filesWithoutPragmaDirectives.join(
           ", ",
         )}`,
@@ -128,7 +131,8 @@ const flattenAction: NewTaskActionFunction<FlattenActionArguments> = async (
 
   if (filesWithDifferentPragmaDirectives.length > 0) {
     warn(
-      chalk.yellow(
+      styleText(
+        "yellow",
         `\nThe flattened file is using the pragma abicoder directive '${pragmaDirective}' but these files have a different pragma abicoder directive: ${filesWithDifferentPragmaDirectives.join(
           ", ",
         )}`,

package/src/internal/builtin-plugins/gas-analytics/function-gas-snapshots.ts

@@ -1,6 +1,7 @@
 import type { SuiteResult } from "@nomicfoundation/edr";
 
 import path from "node:path";
+import { styleText } from "node:util";
 
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
@@ -10,7 +11,6 @@ import {
   writeUtf8File,
 } from "@nomicfoundation/hardhat-utils/fs";
 import { findDuplicates } from "@nomicfoundation/hardhat-utils/lang";
-import chalk from "chalk";
 
 import {
   getFullyQualifiedName,
@@ -388,7 +388,8 @@ export function logFunctionGasSnapshotsSection(
   if (isFirstTimeWrite) {
     logger();
     logger(
-      chalk.green(
+      styleText(
+        "green",
         "  No existing snapshots found. Function gas snapshots written successfully",
       ),
     );
@@ -408,7 +409,7 @@ export function logFunctionGasSnapshotsSection(
       "\n",
     );
     for (const line of addedLines) {
-      logger(chalk.green(`    + ${line}`));
+      logger(styleText("green", `    + ${line}`));
     }
   }
 
@@ -419,7 +420,7 @@ export function logFunctionGasSnapshotsSection(
       comparison.removed,
     ).split("\n");
     for (const line of removedLines) {
-      logger(chalk.red(`    - ${line}`));
+      logger(styleText("red", `    - ${line}`));
     }
   }
 
@@ -435,10 +436,10 @@ export function printFunctionGasSnapshotChanges(
     const isLast = i === changes.length - 1;
 
     logger(`  ${change.contractNameOrFqn}#${change.functionSig}`);
-    logger(chalk.grey(`    (in ${change.source})`));
+    logger(styleText("grey", `    (in ${change.source})`));
 
     if (change.kind === "fuzz") {
-      logger(chalk.grey(`    Runs: ${change.runs}`));
+      logger(styleText("grey", `    Runs: ${change.runs}`));
     }
 
     const diff = change.actual - change.expected;
@@ -454,15 +455,15 @@ export function printFunctionGasSnapshotChanges(
 
     // Color: green for decrease (improvement), red for increase (regression)
     const formattedGasChange =
-      diff < 0 ? chalk.green(gasChange) : chalk.red(gasChange);
+      diff < 0 ? styleText("green", gasChange) : styleText("red", gasChange);
 
     const label = change.kind === "fuzz" ? "~" : "gas";
 
-    logger(chalk.grey(`    Expected (${label}): ${change.expected}`));
+    logger(styleText("grey", `    Expected (${label}): ${change.expected}`));
     logger(
-      chalk.grey(`    Actual (${label}):   ${change.actual} (`) +
+      styleText("grey", `    Actual (${label}):   ${change.actual} (`) +
         formattedGasChange +
-        chalk.grey(")"),
+        styleText("grey", ")"),
     );
 
     if (!isLast) {

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

@@ -10,11 +10,13 @@ import type { TableItem } from "@nomicfoundation/hardhat-utils/format";
 
 import crypto from "node:crypto";
 import path from "node:path";
+import { styleText } from "node:util";
 
 import {
   HardhatError,
   assertHardhatInvariant,
 } from "@nomicfoundation/hardhat-errors";
+import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
 import { formatTable } from "@nomicfoundation/hardhat-utils/format";
 import {
   ensureDir,
@@ -26,8 +28,6 @@ import {
   writeJsonFile,
 } from "@nomicfoundation/hardhat-utils/fs";
 import { findDuplicates } from "@nomicfoundation/hardhat-utils/lang";
-import chalk from "chalk";
-import debug from "debug";
 
 import { parseFullyQualifiedName } from "../../../utils/contract-names.js";
 
@@ -41,7 +41,7 @@ import {
   median,
 } from "./helpers/utils.js";
 
-const gasStatsLog = debug(
+const gasStatsLog = createDebug(
   "hardhat:core:gas-analytics:gas-analytics-manager:gas-stats",
 );
 
@@ -311,7 +311,10 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
     const rows: TableItem[] = [];
 
     if (gasStatsByContract.size > 0) {
-      rows.push({ type: "title", text: chalk.bold("Gas Usage Statistics") });
+      rows.push({
+        type: "title",
+        text: styleText("bold", "Gas Usage Statistics"),
+      });
     }
 
     const sortedContracts = getSortedContractEntries(gasStatsByContract);
@@ -322,8 +325,9 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
     } of sortedContracts) {
       rows.push({
         type: "section-header",
-        text: chalk.cyan.bold(userFqn),
-        subtitle: proxyLabel !== undefined ? chalk.cyan(proxyLabel) : undefined,
+        text: styleText(["cyan", "bold"], userFqn),
+        subtitle:
+          proxyLabel !== undefined ? styleText("cyan", proxyLabel) : undefined,
       });
 
       if (contractGasStats.functions.size > 0) {
@@ -336,7 +340,7 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
             "Median",
             "Max",
             "#calls",
-          ].map((s) => chalk.yellow(s)),
+          ].map((s) => styleText("yellow", s)),
         });
       }
 
@@ -372,7 +376,7 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
             "Median",
             "Max",
             "#deployments",
-          ].map((s) => chalk.yellow(s)),
+          ].map((s) => styleText("yellow", s)),
         });
         rows.push({
           type: "row",
@@ -388,7 +392,7 @@ export class GasAnalyticsManagerImplementation implements GasAnalyticsManager {
         rows.push({
           type: "header",
           cells: [
-            chalk.yellow("Bytecode size"),
+            styleText("yellow", "Bytecode size"),
             `${contractGasStats.deployment.runtimeSize}`,
           ],
         });

package/src/internal/builtin-plugins/gas-analytics/helpers/accessors.ts

@@ -2,7 +2,7 @@
 // handler and task-actions that may run on every `hardhat test` invocation
 // regardless of whether the feature is enabled. It must stay lightweight:
 // do not add top-level imports that pull in the gas-analytics-manager module
-// graph (chalk, debug, node:crypto, file-system traversal, etc.), or the
+// graph (debug, node:crypto, file-system traversal, etc.), or the
 // `--gas-stats` lazy-load is silently defeated for every caller.
 // If a new helper needs a heavy dependency, put it in a sibling file
 // (e.g. `helpers/utils.ts`) so the accessors file's import cost stays flat.

package/src/internal/builtin-plugins/gas-analytics/helpers/utils.ts

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import { styleText } from "node:util";
 
 /**
  * Converts an internal FQN (e.g. `"project/contracts/Foo.sol:Foo"` or
@@ -108,5 +108,5 @@ export function formatSectionHeader(
     parts.push(`${removedLength} removed`);
   }
 
-  return `${sectionName}: ${chalk.gray(parts.join(", "))}`;
+  return `${sectionName}: ${styleText("gray", parts.join(", "))}`;
 }

package/src/internal/builtin-plugins/gas-analytics/snapshot-cheatcodes.ts

@@ -1,6 +1,7 @@
 import type { SuiteResult } from "@nomicfoundation/edr";
 
 import path from "node:path";
+import { styleText } from "node:util";
 
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
@@ -12,7 +13,6 @@ import {
   remove,
   writeJsonFile,
 } from "@nomicfoundation/hardhat-utils/fs";
-import chalk from "chalk";
 
 import {
   getFullyQualifiedName,
@@ -371,7 +371,8 @@ export function logSnapshotCheatcodesSection(
   if (isFirstTimeWrite) {
     logger();
     logger(
-      chalk.green(
+      styleText(
+        "green",
         "  No existing snapshots found. Snapshot cheatcodes written successfully",
       ),
     );
@@ -391,7 +392,7 @@ export function logSnapshotCheatcodesSection(
       "\n",
     );
     for (const line of addedLines) {
-      logger(chalk.green(`    + ${line}`));
+      logger(styleText("green", `    + ${line}`));
     }
   }
 
@@ -402,7 +403,7 @@ export function logSnapshotCheatcodesSection(
       "\n",
     );
     for (const line of removedLines) {
-      logger(chalk.red(`    - ${line}`));
+      logger(styleText("red", `    - ${line}`));
     }
   }
 
@@ -418,7 +419,7 @@ export function printSnapshotCheatcodeChanges(
     const isLast = i === changes.length - 1;
 
     logger(`  ${change.group}#${change.name}`);
-    logger(chalk.grey(`    (in ${change.source})`));
+    logger(styleText("grey", `    (in ${change.source})`));
 
     const diff = change.actual - change.expected;
     const formattedDiff = diff > 0 ? `Δ+${diff}` : `Δ${diff}`;
@@ -433,13 +434,13 @@ export function printSnapshotCheatcodeChanges(
 
     // Color: green for decrease (improvement), red for increase (regression)
     const formattedGasChange =
-      diff < 0 ? chalk.green(gasChange) : chalk.red(gasChange);
+      diff < 0 ? styleText("green", gasChange) : styleText("red", gasChange);
 
-    logger(chalk.grey(`    Expected: ${change.expected}`));
+    logger(styleText("grey", `    Expected: ${change.expected}`));
     logger(
-      chalk.grey(`    Actual:   ${change.actual} (`) +
+      styleText("grey", `    Actual:   ${change.actual} (`) +
         formattedGasChange +
-        chalk.grey(")"),
+        styleText("grey", ")"),
     );
 
     if (!isLast) {

package/src/internal/builtin-plugins/gas-analytics/tasks/solidity-test/task-action.ts

@@ -5,8 +5,9 @@ import type { FunctionGasSnapshotCheckResult } from "../../function-gas-snapshot
 import type { SnapshotCheatcodesCheckResult } from "../../snapshot-cheatcodes.js";
 import type { SuiteResult } from "@nomicfoundation/edr";
 
+import { styleText } from "node:util";
+
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
-import chalk from "chalk";
 
 import { errorResult } from "../../../../../utils/result.js";
 import {
@@ -103,7 +104,7 @@ export function logSnapshotResult(
   logger: typeof console.log = console.log,
 ): void {
   if (result.functionGasSnapshotsWritten) {
-    logger(chalk.green("Function gas snapshots written successfully"));
+    logger(styleText("green", "Function gas snapshots written successfully"));
     logger();
   }
 }
@@ -133,8 +134,8 @@ export function logSnapshotCheckResult(
 ): void {
   logger(
     functionGasSnapshotsCheck.passed && snapshotCheatcodesCheck.passed
-      ? chalk.green("Snapshot check passed")
-      : chalk.red("Snapshot check failed"),
+      ? styleText("green", "Snapshot check passed")
+      : styleText("red", "Snapshot check failed"),
   );
 
   const functionGasHasOutput =
@@ -164,7 +165,12 @@ export function logSnapshotCheckResult(
   logSnapshotCheatcodesSection(snapshotCheatcodesCheck, logger);
 
   if (!functionGasSnapshotsCheck.passed || !snapshotCheatcodesCheck.passed) {
-    logger(chalk.yellow("To update snapshots, run your tests with --snapshot"));
+    logger(
+      styleText(
+        "yellow",
+        "To update snapshots, run your tests with --snapshot",
+      ),
+    );
     logger();
   }
 }

package/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts

@@ -29,9 +29,9 @@ import {
   HardhatError,
 } from "@nomicfoundation/hardhat-errors";
 import { toSeconds } from "@nomicfoundation/hardhat-utils/date";
+import { createDebug } from "@nomicfoundation/hardhat-utils/debug";
 import { ensureError } from "@nomicfoundation/hardhat-utils/error";
 import { numberToHexString } from "@nomicfoundation/hardhat-utils/hex";
-import debug from "debug";
 
 import { sendErrorTelemetry } from "../../../cli/telemetry/error-reporter/reporter.js";
 import { EDR_NETWORK_REVERT_SNAPSHOT_EVENT } from "../../../constants.js";
@@ -59,7 +59,7 @@ import {
 } from "./utils/convert-to-edr.js";
 import { printLine, replaceLastLine } from "./utils/logger.js";
 
-const log = debug("hardhat:core:hardhat-network:provider");
+const log = createDebug("hardhat:core:network-manager:edr:provider");
 
 interface EdrProviderConfig {
   chainDescriptors: ChainDescriptorsConfig;

package/src/internal/builtin-plugins/network-manager/edr/utils/trace-formatters.ts

@@ -1,10 +1,11 @@
-import type { Colorizer } from "../../../../utils/colorizer.js";
 import type {
   LogTrace,
   CallTrace,
   DecodedTraceParameters,
 } from "@nomicfoundation/edr";
 
+import { styleText } from "node:util";
+
 import { LogKind, CallKind, IncludeTraces } from "@nomicfoundation/edr";
 import { bytesToHexString } from "@nomicfoundation/hardhat-utils/hex";
 
@@ -23,9 +24,10 @@ export function verbosityToIncludeTraces(verbosity: number): IncludeTraces {
 export function formatTraces(
   traces: CallTrace[],
   prefix: string,
-  colorizer: Colorizer,
+  // Allow passing a custom colorize function for testing purposes
+  colorize: typeof styleText = styleText,
 ): string {
-  const lines = traces.map((trace) => formatTrace(trace, colorizer));
+  const lines = traces.map((trace) => formatTrace(trace, colorize));
   const formattedTraces = formatNestedArray(lines, prefix);
   // Remove the trailing newline
   return formattedTraces.slice(0, -1);
@@ -52,9 +54,13 @@ function formatOutputs(outputs: string | Uint8Array): string | undefined {
   }
 }
 
-function formatLog(log: LogTrace, colorizer: Colorizer): string[] {
+function formatLog(
+  log: LogTrace,
+  // Allow passing a custom colorize function for testing purposes
+  colorize: typeof styleText,
+): string[] {
   const { parameters } = log;
-  const tag = colorizer.yellow("[event]");
+  const tag = colorize("yellow", "[event]");
   const lines = [];
 
   if (Array.isArray(parameters)) {
@@ -63,18 +69,18 @@ function formatLog(log: LogTrace, colorizer: Colorizer): string[] {
 
     for (let i = 0; i < topicCount; i++) {
       const prefix = i === 0 ? `${tag} topic 0` : `        topic ${i}`;
-      lines.push(`${prefix}: ${colorizer.cyan(hexValues[i])}`);
+      lines.push(`${prefix}: ${colorize("cyan", hexValues[i])}`);
     }
 
     if (hexValues.length > 0) {
       const dataPrefix = topicCount > 0 ? "           data" : `${tag}    data`;
       lines.push(
-        `${dataPrefix}: ${colorizer.cyan(hexValues[hexValues.length - 1])}`,
+        `${dataPrefix}: ${colorize("cyan", hexValues[hexValues.length - 1])}`,
       );
     }
   } else {
     lines.push(
-      `${tag} ${parameters.name}(${colorizer.cyan(parameters.arguments.join(", "))})`,
+      `${tag} ${parameters.name}(${colorize("cyan", parameters.arguments.join(", "))})`,
     );
   }
   return lines;
@@ -82,7 +88,7 @@ function formatLog(log: LogTrace, colorizer: Colorizer): string[] {
 
 function formatTrace(
   trace: CallTrace,
-  colorizer: Colorizer,
+  colorize: typeof styleText,
 ): NestedArray<string> {
   const {
     success,
@@ -95,14 +101,8 @@ function formatTrace(
     isCheatcode,
     outputs,
   } = trace;
-  let color;
-  if (isCheatcode) {
-    color = colorizer.blue;
-  } else if (success) {
-    color = colorizer.green;
-  } else {
-    color = colorizer.red;
-  }
+  const colorName = isCheatcode ? "blue" : success ? "green" : "red";
+  const color = (text: string) => colorize(colorName, text);
 
   const formattedInputs = formatInputs(inputs, color);
   const formattedOutputs = formatOutputs(outputs);
@@ -110,7 +110,7 @@ function formatTrace(
   let openingLine: string;
   let closingLine: string | undefined;
   if (kind === CallKind.Create) {
-    openingLine = `[${gasUsed}] ${colorizer.yellow("→ new")} ${contract ?? "<unknown>"}@${address}`;
+    openingLine = `[${gasUsed}] ${colorize("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) {
@@ -125,11 +125,11 @@ function formatTrace(
       openingLine = `${openingLine} {value: ${value}}`;
     }
     if (kind === CallKind.StaticCall) {
-      openingLine = `${openingLine} ${colorizer.yellow("[staticcall]")}`;
+      openingLine = `${openingLine} ${colorize("yellow", "[staticcall]")}`;
     } else if (kind === CallKind.DelegateCall) {
-      openingLine = `${openingLine} ${colorizer.yellow("[delegatecall]")}`;
+      openingLine = `${openingLine} ${colorize("yellow", "[delegatecall]")}`;
     } else if (kind === CallKind.CallCode) {
-      openingLine = `${openingLine} ${colorizer.yellow("[callcode]")}`;
+      openingLine = `${openingLine} ${colorize("yellow", "[callcode]")}`;
     }
   }
   if (formattedOutputs !== undefined) {
@@ -147,9 +147,9 @@ function formatTrace(
   lines.push(openingLine);
   for (const child of trace.children) {
     if (child.kind === LogKind.Log) {
-      lines.push(formatLog(child, colorizer));
+      lines.push(formatLog(child, colorize));
     } else {
-      lines.push(formatTrace(child, colorizer));
+      lines.push(formatTrace(child, colorize));
     }
   }
   if (closingLine !== undefined) {