fix: assert the error.data response

Author: schaable

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/edr-provider.ts

@@ -39,6 +39,10 @@ import { getJsonRpcRequest, isFailedJsonRpcResponse } from "../json-rpc.js";
 import { getGlobalEdrContext } from "./edr-context.js";
 import { InvalidArgumentsError, ProviderError } from "./errors.js";
 import { createSolidityErrorWithStackTrace } from "./stack-traces/stack-trace-solidity-errors.js";
+import {
+  isDebugTraceResult,
+  isEdrProviderErrorData,
+} from "./type-validation.js";
 import { clientVersion } from "./utils/client-version.js";
 import { ConsoleLogger } from "./utils/console-logger.js";
 import {
@@ -50,7 +54,6 @@ import {
   hardhatChainsToEdrChains,
   hardhatForkingConfigToEdrForkConfig,
   hardhatChainTypeToEdrChainType,
-  isDebugTraceResult,
 } from "./utils/convert-to-edr.js";
 import { printLine, replaceLastLine } from "./utils/logger.js";
 
@@ -283,20 +286,18 @@ export class EdrProvider extends BaseProvider {
       }
 
       if (stackTrace !== null) {
-        // Pass data and transaction hash from the original error
-        /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        -- If we have a stack trace, we know that the json rpc response data
-        is an object with the data and transactionHash fields */
-        const responseErrorData = responseError.data as {
-          data?: string;
-          transactionHash?: string;
-        };
+        // If we have a stack trace, we know that the json rpc response data
+        // is an object with the data and transactionHash fields
+        assertHardhatInvariant(
+          isEdrProviderErrorData(responseError.data),
+          "Invalid error data",
+        );
 
         error = createSolidityErrorWithStackTrace(
           responseError.message,
           stackTrace,
-          responseErrorData?.data,
-          responseErrorData?.transactionHash,
+          responseError.data.data,
+          responseError.data.transactionHash,
         );
       } else {
         error =

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

@@ -20,7 +20,7 @@ import {
 export function createSolidityErrorWithStackTrace(
   fallbackMessage: string,
   stackTrace: SolidityStackTrace,
-  data?: string,
+  data: string,
   transactionHash?: string,
 ): SolidityError {
   const originalPrepareStackTrace = Error.prepareStackTrace;
@@ -298,7 +298,7 @@ export class SolidityError extends Error {
   constructor(
     message: string,
     public readonly stackTrace: SolidityStackTrace,
-    public readonly data?: string,
+    public readonly data: string,
     public readonly transactionHash?: string,
   ) {
     super(message);

v-next/hardhat/src/internal/builtin-plugins/network-manager/edr/type-validation.ts

@@ -0,0 +1,25 @@
+import type { DebugTraceResult } from "@ignored/edr-optimism";
+
+import { isObject } from "@ignored/hardhat-vnext-utils/lang";
+
+export function isDebugTraceResult(
+  result: unknown,
+): result is DebugTraceResult {
+  return (
+    isObject(result) &&
+    "pass" in result &&
+    "gasUsed" in result &&
+    "structLogs" in result
+  );
+}
+
+interface EdrProviderErrorData {
+  data: string;
+  transactionHash?: string;
+}
+
+export function isEdrProviderErrorData(
+  errorData: unknown,
+): errorData is EdrProviderErrorData {
+  return isObject(errorData) && "data" in errorData;
+}

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

@@ -41,7 +41,6 @@ import {
   GENERIC_CHAIN_TYPE as EDR_GENERIC_CHAIN_TYPE,
 } from "@ignored/edr-optimism";
 import { getUnprefixedHexString } from "@ignored/hardhat-vnext-utils/hex";
-import { isObject } from "@ignored/hardhat-vnext-utils/lang";
 
 import { L1_CHAIN_TYPE, OPTIMISM_CHAIN_TYPE } from "../../../../constants.js";
 import { FixedValueConfigurationVariable } from "../../../../core/configuration-variables.js";
@@ -233,17 +232,6 @@ export function edrRpcDebugTraceToHardhat(
   };
 }
 
-export function isDebugTraceResult(
-  result: unknown,
-): result is DebugTraceResult {
-  return (
-    isObject(result) &&
-    "pass" in result &&
-    "gasUsed" in result &&
-    "structLogs" in result
-  );
-}
-
 export async function hardhatAccountsToEdrOwnedAccounts(
   accounts: EdrNetworkAccountsConfig,
 ): Promise<OwnedAccount[]> {