refactor: use hex utils

Author: schaable

v-next/hardhat-utils/src/hex.ts

@@ -95,7 +95,7 @@ export function hexStringToNumber(hexString: string): number {
  * @returns PrefixedHexString The hexadecimal representation of the bytes.
  */
 export function bytesToHexString(bytes: Uint8Array): PrefixedHexString {
-  return `0x${Buffer.from(bytes).toString("hex")}`;
+  return getPrefixedHexString(Buffer.from(bytes).toString("hex"));
 }
 
 /**
@@ -141,9 +141,7 @@ export function normalizeHexString(hexString: string): PrefixedHexString {
     );
   }
 
-  return isPrefixedHexString(normalizedHexString)
-    ? normalizedHexString
-    : `0x${normalizedHexString}`;
+  return getPrefixedHexString(normalizedHexString);
 }
 
 /**

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/panic-errors.ts

@@ -1,11 +1,13 @@
+import { numberToHexString } from "@ignored/hardhat-vnext-utils/hex";
+
 export function panicErrorCodeToMessage(errorCode: bigint): string {
   const reason = panicErrorCodeToReason(errorCode);
 
   if (reason !== undefined) {
-    return `reverted with panic code 0x${errorCode.toString(16)} (${reason})`;
+    return `reverted with panic code ${numberToHexString(errorCode)} (${reason})`;
   }
 
-  return `reverted with unknown panic code 0x${errorCode.toString(16)}`;
+  return `reverted with unknown panic code ${numberToHexString(errorCode)}`;
 }
 
 function panicErrorCodeToReason(errorCode: bigint): string | undefined {

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/stack-traces/stack-trace-solidity-errors.ts

@@ -237,9 +237,7 @@ function getMessageFromLastStackTraceEntry(
       }
 
       if (!returnData.isEmpty()) {
-        const buffer = Buffer.from(returnData.value).toString("hex");
-
-        return `VM Exception while processing transaction: reverted with an unrecognized custom error (return data: 0x${buffer})`;
+        return `VM Exception while processing transaction: reverted with an unrecognized custom error (return data: ${bytesToHexString(returnData.value)})`;
       }
 
       if (stackTraceEntry.isInvalidOpcodeError) {

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/utils/convert-to-edr.ts

@@ -40,7 +40,10 @@ import {
   L1_CHAIN_TYPE as EDR_L1_CHAIN_TYPE,
   GENERIC_CHAIN_TYPE as EDR_GENERIC_CHAIN_TYPE,
 } from "@ignored/edr-optimism";
-import { getUnprefixedHexString } from "@ignored/hardhat-vnext-utils/hex";
+import {
+  bytesToHexString,
+  getUnprefixedHexString,
+} from "@ignored/hardhat-vnext-utils/hex";
 
 import { L1_CHAIN_TYPE, OPTIMISM_CHAIN_TYPE } from "../../../../constants.js";
 import { FixedValueConfigurationVariable } from "../../../../core/configuration-variables.js";
@@ -214,20 +217,23 @@ export function edrRpcDebugTraceToHardhat(
   });
 
   // REVM trace adds initial STOP that Hardhat doesn't expect
-  // ASK: is this still valid?
+  // TODO: double check with EDR team that this is still the case
   if (structLogs.length > 0 && structLogs[0].op === "STOP") {
     structLogs.shift();
   }
 
-  let returnValue = debugTraceResult.output?.toString("hex") ?? "";
+  let returnValue =
+    debugTraceResult.output !== undefined
+      ? bytesToHexString(debugTraceResult.output)
+      : "";
   if (returnValue === "0x") {
     returnValue = "";
   }
 
   return {
     failed: !debugTraceResult.pass,
     gas: Number(debugTraceResult.gasUsed),
-    returnValue, // ASK: do we expect an unprefixed hex string here?
+    returnValue,
     structLogs,
   };
 }

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

@@ -9,6 +9,8 @@ import type {
   SolidityBuildInfoOutput,
 } from "../../../../types/solidity/solidity-artifacts.js";
 
+import { getPrefixedHexString } from "@ignored/hardhat-vnext-utils/hex";
+
 export function getContractArtifact(
   buildInfoId: string,
   publicSourceName: string,
@@ -17,18 +19,16 @@ export function getContractArtifact(
   contract: CompilerOutputContract,
 ): Artifact {
   const evmBytecode = contract.evm?.bytecode;
-  let bytecode: string = evmBytecode?.object ?? "";
-
-  if (bytecode.slice(0, 2).toLowerCase() !== "0x") {
-    bytecode = `0x${bytecode}`;
-  }
+  const bytecode: string =
+    evmBytecode?.object !== undefined
+      ? getPrefixedHexString(evmBytecode.object)
+      : "";
 
   const evmDeployedBytecode = contract.evm?.deployedBytecode;
-  let deployedBytecode: string = evmDeployedBytecode?.object ?? "";
-
-  if (deployedBytecode.slice(0, 2).toLowerCase() !== "0x") {
-    deployedBytecode = `0x${deployedBytecode}`;
-  }
+  const deployedBytecode: string =
+    evmDeployedBytecode?.object !== undefined
+      ? getPrefixedHexString(evmDeployedBytecode.object)
+      : "";
 
   const linkReferences = evmBytecode?.linkReferences ?? {};
   const deployedLinkReferences = evmDeployedBytecode?.linkReferences ?? {};