fix: use isHex

Author: Jeday

features/defi-wrapper/timelock.ts

@@ -4,7 +4,7 @@ import {
   confirmOperation,
   callReadMethodSilent,
 } from 'utils';
-import { Address, Hex, stringToHex, zeroHash } from 'viem';
+import { Address, Hex, stringToHex, zeroHash, isHash } from 'viem';
 import { getTimeLockContract } from 'contracts/defi-wrapper/index.js';
 import { getPublicClient } from 'providers';
 
@@ -23,23 +23,21 @@ export const resolveRole = async (
   contractAddress: Address,
   getContract: (address: Address) => Promise<any>,
 ): Promise<Hex> => {
-  if (!roleInput.startsWith('0x')) {
-    const contract = await getContract(contractAddress);
-    try {
-      const role = (await callReadMethodSilent({
-        contract,
-        methodName: roleInput as any,
-        payload: [],
-      })) as Hex;
-      logInfo(`Resolved role "${roleInput}" to ${role}`);
-      return role;
-    } catch {
-      throw new Error(
-        `Failed to resolve role "${roleInput}". Please provide a valid role name (e.g., DEFAULT_ADMIN_ROLE) or bytes32 hex.`,
-      );
-    }
-  } else {
-    return roleInput as Hex;
+  if (isHash(roleInput)) return roleInput;
+
+  const contract = await getContract(contractAddress);
+  try {
+    const role = (await callReadMethodSilent({
+      contract,
+      methodName: roleInput as any,
+      payload: [],
+    })) as Hex;
+    logInfo(`Resolved role "${roleInput}" to ${role}`);
+    return role;
+  } catch {
+    throw new Error(
+      `Failed to resolve role "${roleInput}". Please provide a valid role name (e.g., DEFAULT_ADMIN_ROLE) or bytes32 hex.`,
+    );
   }
 };
 

utils/transactions/utils.ts

@@ -1,4 +1,4 @@
-import { Abi, decodeErrorResult, Hex, SimulateCallsReturnType } from 'viem';
+import { Abi, decodeErrorResult, isHex, SimulateCallsReturnType } from 'viem';
 import { DashboardAbi } from 'abi';
 import { printError } from 'utils';
 
@@ -18,11 +18,11 @@ export const simulateCallsErrorHandler = (
 
     if (data) {
       // Check if data is already decoded (object) or needs decoding (hex string)
-      if (typeof data === 'string' && data.startsWith('0x')) {
+      if (typeof data === 'string' && isHex(data)) {
         // data is a hex string, decode it
         const { errorName, args } = decodeErrorResult({
           abi: abi ?? DashboardAbi,
-          data: data as Hex,
+          data: data,
         });
 
         const errorArgs = args?.map((a) => a?.toString() ?? '') ?? [];