Remove typechain FEDEV-3220

.eslintrc.json

@@ -84,6 +84,7 @@
     "local-rules/no-logical-bigint": "off",
 
     "es-x/no-bigint": "off",
+    "es-x/no-optional-catch-binding": "off",
     "es-x/no-optional-chaining": "off",
     "es-x/no-import-meta": "off",
     "es-x/no-dynamic-import": "off",

.gitignore

@@ -6,8 +6,6 @@
 .pnp.js
 .vscode
 
-# typechain-types
-/src/typechain-types
 
 # lingui
 /src/locales/**/*.js

sdk/.gitignore

@@ -34,8 +34,6 @@ yarn-error.log*
 # For publish
 .npmrc
 
-typechain-types
-
 package-lock.json
 
 .yarn/*

sdk/src/types/tradeHistory.ts

@@ -45,7 +45,7 @@ export type PositionTradeAction = {
   orderKey: string;
   isLong: boolean;
   reason?: string;
-  reasonBytes?: string | Uint8Array;
+  reasonBytes?: string;
   shouldUnwrapNativeToken: boolean;
   totalImpactUsd?: bigint;
   liquidationFeeAmount?: bigint;
@@ -78,7 +78,7 @@ export type SwapTradeAction = {
   orderType: OrderType;
   orderKey: string;
   reason?: string;
-  reasonBytes?: string | Uint8Array;
+  reasonBytes?: string;
   twapParams:
     | {
         twapGroupId: string;

sdk/src/utils/__tests__/parseError.spec.ts

@@ -1,6 +1,14 @@
+import {
+  CallExecutionError,
+  ContractFunctionExecutionError,
+  ContractFunctionRevertedError,
+  InvalidInputRpcError,
+  RpcRequestError,
+  InsufficientFundsError,
+} from "viem";
 import { describe, expect, it } from "vitest";
 
-import { parseError, ErrorLike } from "utils/errors";
+import { ErrorLike, parseError } from "utils/errors";
 import { TxErrorType } from "utils/errors/transactionsErrors";
 
 describe("parseError", () => {
@@ -337,4 +345,67 @@ describe("parseError", () => {
       );
     });
   });
+
+  describe("viem errors", () => {
+    it("should handle viem ContractFunctionExecutionError", () => {
+      const error = new ContractFunctionExecutionError(
+        new ContractFunctionRevertedError({
+          abi: [],
+          functionName: "test_function",
+          data: "0x4e48dcda",
+          message: "test message",
+        }),
+        {
+          abi: [],
+          functionName: "test_function",
+        }
+      );
+
+      const result = parseError(error);
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          contractError: "EndOfOracleSimulation",
+        })
+      );
+    });
+
+    it("should handle viem InsufficientFundsError", () => {
+      const error = new ContractFunctionExecutionError(
+        new CallExecutionError(
+          new InsufficientFundsError({
+            cause: new InvalidInputRpcError(
+              new InvalidInputRpcError(
+                new RpcRequestError({
+                  error: {
+                    message:
+                      "err: insufficient funds for gas * price + value: address 0x6f9f3106F0209dc560A53C6808f8BF32E38468C3 have 4174472651641805 want 10000000000000000000 (supplied gas 1100000000)",
+                    code: -32000,
+                  },
+                  body: {},
+                  url: "https://example.com",
+                })
+              )
+            ),
+          }),
+          {}
+        ),
+        {
+          abi: [],
+          functionName: "test_function",
+        }
+      );
+
+      const result = parseError(error);
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          txErrorType: TxErrorType.NotEnoughFunds,
+          isUserError: true,
+          isUserRejectedError: false,
+          errorGroup: "Txn Error: NOT_ENOUGH_FUNDS",
+        })
+      );
+    });
+  });
 });

sdk/src/utils/errors/parseError.ts

@@ -1,5 +1,12 @@
 import cryptoJs from "crypto-js";
-import { Abi, decodeErrorResult } from "viem";
+import {
+  Abi,
+  AbiParameterToPrimitiveType,
+  ContractErrorName,
+  decodeErrorResult,
+  ExtractAbiItem,
+  BaseError as ViemBaseError,
+} from "viem";
 
 import { abis } from "abis";
 
@@ -12,6 +19,31 @@ import {
   getIsUserRejectedError,
 } from "./transactionsErrors";
 
+export function extractErrorDataFromViemError(error: any): string | undefined {
+  if (!("walk" in error && typeof error.walk === "function")) {
+    return undefined;
+  }
+
+  let data: string | undefined;
+  (error as ViemBaseError).walk((e: any) => {
+    if (typeof e?.data === "string") {
+      data = e.data;
+      return true;
+    }
+    if (typeof e?.data?.data === "string") {
+      data = e.data.data;
+      return true;
+    }
+    if (typeof e?.raw === "string") {
+      data = e.raw;
+      return true;
+    }
+    return false;
+  });
+
+  return data;
+}
+
 export type OrderErrorContext =
   | "simulation"
   | "gasLimit"
@@ -150,17 +182,25 @@ export function parseError(error: ErrorLike | string | undefined, errorDepth = 0
       //
     }
 
-    if (errorMessage) {
-      const errorData = extractDataFromError(errorMessage) ?? extractDataFromError((error as any)?.message);
+    if (!contractError) {
+      const errorData =
+        (error && typeof error === "object" ? extractErrorDataFromViemError(error) : undefined) ??
+        extractDataFromError(errorMessage) ??
+        extractDataFromError((error as any)?.message);
+
       if (errorData) {
-        const parsedError = decodeErrorResult({
-          abi: abis.CustomErrors as Abi,
-          data: errorData,
-        });
-
-        if (parsedError) {
-          contractError = parsedError.errorName;
-          contractErrorArgs = parsedError.args;
+        try {
+          const parsedError = decodeErrorResult({
+            abi: abis.CustomErrors as Abi,
+            data: errorData,
+          });
+
+          if (parsedError) {
+            contractError = parsedError.errorName;
+            contractErrorArgs = parsedError.args;
+          }
+        } catch {
+          //
         }
       }
     }
@@ -244,28 +284,56 @@ export function isCustomError(error: Error | undefined): error is CustomError {
   return (error as CustomError)?.isGmxCustomError === true;
 }
 
-export function getCustomError(error: Error): CustomError | Error {
-  const data = (error as any)?.info?.error?.data ?? (error as any)?.data;
-
-  let prettyErrorName = error.name;
-  let prettyErrorMessage = error.message;
-  let prettyErrorArgs: any = undefined;
+export type ParsedCustomError = {
+  name: string;
+  args?: {
+    [key in ExtractAbiItem<
+      typeof abis.CustomErrors,
+      ContractErrorName<typeof abis.CustomErrors>
+    >["inputs"][number]["name"]]: AbiParameterToPrimitiveType<
+      Extract<
+        ExtractAbiItem<typeof abis.CustomErrors, ContractErrorName<typeof abis.CustomErrors>>["inputs"][number],
+        {
+          name: key;
+        }
+      >,
+      "inputs"
+    >;
+  };
+};
 
+export function tryDecodeCustomError(reasonBytes: string): ParsedCustomError | undefined {
   try {
-    const parsedError = decodeErrorResult({
+    const decoded = decodeErrorResult({
       abi: abis.CustomErrors,
-      data: data,
+      data: reasonBytes,
     });
 
-    prettyErrorArgs = parsedError.args;
+    // Convert args array to key-value dictionary for backward compatibility
+    if (
+      decoded.args &&
+      Array.isArray(decoded.args) &&
+      decoded.abiItem &&
+      "inputs" in decoded.abiItem &&
+      decoded.abiItem.inputs
+    ) {
+      const argsDict: Record<string, any> = {};
+      for (const [index, input] of decoded.abiItem.inputs.entries()) {
+        argsDict[input.name] = decoded.args[index];
+      }
+      return { name: decoded.errorName, args: argsDict as any };
+    }
 
-    prettyErrorName = parsedError.errorName;
-    prettyErrorMessage = JSON.stringify(parsedError, null, 2);
-  } catch (decodeError) {
-    return error;
+    return { name: decoded.errorName, args: undefined };
+  } catch {
+    return undefined;
   }
+}
 
-  const prettyError = new CustomError({ name: prettyErrorName, message: prettyErrorMessage, args: prettyErrorArgs });
-
-  return prettyError;
+export function decodeErrorFromViemError(error: any): ParsedCustomError | undefined {
+  const data = extractErrorDataFromViemError(error);
+  if (!data) {
+    return undefined;
+  }
+  return tryDecodeCustomError(data);
 }

src/App/App.tsx

@@ -28,7 +28,6 @@ import { ThemeProvider } from "context/ThemeContext/ThemeContext";
 import { TokenPermitsContextProvider } from "context/TokenPermitsContext/TokenPermitsContextProvider";
 import { TokensBalancesContextProvider } from "context/TokensBalancesContext/TokensBalancesContextProvider";
 import { TokensFavoritesContextProvider } from "context/TokensFavoritesContext/TokensFavoritesContextProvider";
-import { WebsocketContextProvider } from "context/WebsocketContext/WebsocketContextProvider";
 import { useChainId } from "lib/chains";
 import { defaultLocale, dynamicActivate } from "lib/i18n";
 import { RainbowKitProviderWrapper } from "lib/wallets/WalletProvider";
@@ -72,7 +71,6 @@ function App() {
   app = <SubaccountContextProvider>{app}</SubaccountContextProvider>;
   app = <TokenPermitsContextProvider>{app}</TokenPermitsContextProvider>;
   app = <TokensBalancesContextProvider>{app}</TokensBalancesContextProvider>;
-  app = <WebsocketContextProvider>{app}</WebsocketContextProvider>;
   app = <SEO>{app}</SEO>;
   app = <RainbowKitProviderWrapper>{app}</RainbowKitProviderWrapper>;
   app = <I18nProvider i18n={i18n as any}>{app}</I18nProvider>;

src/App/AppRoutes.tsx

@@ -1,8 +1,7 @@
-import { ethers } from "ethers";
 import { useCallback, useEffect, useState } from "react";
 import { useHistory, useLocation } from "react-router-dom";
 import { cssTransition, ToastContainer } from "react-toastify";
-import { Hash } from "viem";
+import { Hash, zeroHash } from "viem";
 
 import { CONTRACTS_CHAIN_IDS, ContractsChainId } from "config/chains";
 import { REFERRAL_CODE_KEY } from "config/localStorage";
@@ -71,7 +70,7 @@ export function AppRoutes() {
 
     if (referralCode && referralCode.length <= 20) {
       const encodedReferralCode = encodeReferralCode(referralCode);
-      if (encodedReferralCode !== ethers.ZeroHash) {
+      if (encodedReferralCode !== zeroHash) {
         localStorage.setItem(REFERRAL_CODE_KEY, encodedReferralCode);
         const queryParams = new URLSearchParams(location.search);
         if (queryParams.has(REFERRAL_CODE_QUERY_PARAM)) {
@@ -96,7 +95,7 @@ export function AppRoutes() {
   const localStorageCode = window.localStorage.getItem(REFERRAL_CODE_KEY);
   const baseUrl = getAppBaseUrl();
   let appRedirectUrl = baseUrl;
-  if (localStorageCode && localStorageCode.length > 0 && localStorageCode !== ethers.ZeroHash) {
+  if (localStorageCode && localStorageCode.length > 0 && localStorageCode !== zeroHash) {
     const decodedRefCode = decodeReferralCode(localStorageCode as Hash);
     if (decodedRefCode) {
       appRedirectUrl = `${appRedirectUrl}?ref=${decodedRefCode}`;

src/components/Earn/Portfolio/AssetsList/GmxAssetCard/StakeModal.tsx

@@ -1,7 +1,8 @@
 import { Trans, t } from "@lingui/macro";
 import cx from "classnames";
-import { ZeroAddress, ethers } from "ethers";
+import { ethers } from "ethers";
 import { useCallback, useEffect, useMemo, useState } from "react";
+import { zeroAddress } from "viem";
 
 import { ARBITRUM, ContractsChainId } from "config/chains";
 import { BASIS_POINTS_DIVISOR_BIGINT } from "config/factors";
@@ -121,7 +122,7 @@ export function StakeModal(props: {
   }, [isVisible, setStakeValue, setUnstakeValue]);
 
   const needApproval =
-    stakeFarmAddress !== ZeroAddress &&
+    stakeFarmAddress !== zeroAddress &&
     tokenAllowance !== undefined &&
     stakeAmount !== undefined &&
     stakeAmount > tokenAllowance;

src/components/GmxAccountModal/DepositView.tsx

@@ -8,8 +8,8 @@ import { Hex, decodeErrorResult, zeroAddress } from "viem";
 import { useAccount, useChains } from "wagmi";
 
 import {
-  AnyChainId,
   AVALANCHE,
+  AnyChainId,
   SettlementChainId,
   SourceChainId,
   getChainName,
@@ -31,8 +31,8 @@ import {
   useGmxAccountDepositViewTokenAddress,
   useGmxAccountDepositViewTokenInputValue,
   useGmxAccountModalOpen,
-  useGmxAccountSelector,
   useGmxAccountSelectedTransferGuid,
+  useGmxAccountSelector,
   useGmxAccountSettlementChainId,
 } from "context/GmxAccountContext/hooks";
 import { selectGmxAccountDepositViewTokenInputAmount } from "context/GmxAccountContext/selectors";
@@ -66,7 +66,6 @@ import {
 } from "lib/metrics";
 import { USD_DECIMALS, adjustForDecimals, formatAmountFree, formatUsd } from "lib/numbers";
 import { EMPTY_ARRAY, EMPTY_OBJECT, getByKey } from "lib/objects";
-import { useJsonRpcProvider } from "lib/rpc";
 import { TxnCallback, TxnEventName, WalletTxnCtx } from "lib/transactions";
 import { useHasOutdatedUi } from "lib/useHasOutdatedUi";
 import { useIsNonEoaAccountOnAnyChain } from "lib/wallets/useAccountType";
@@ -124,7 +123,6 @@ export const DepositView = () => {
   const [, setSettlementChainId] = useGmxAccountSettlementChainId();
   const [depositViewChain, setDepositViewChain] = useGmxAccountDepositViewChain();
   const walletSigner = useEthersSigner({ chainId: srcChainId });
-  const { provider: sourceChainProvider } = useJsonRpcProvider(depositViewChain);
 
   const [isVisibleOrView, setIsVisibleOrView] = useGmxAccountModalOpen();
   const [, setSelectedTransferGuid] = useGmxAccountSelectedTransferGuid();
@@ -349,7 +347,6 @@ export const DepositView = () => {
   const quoteOft = useQuoteOft({
     sendParams: sendParamsWithoutSlippage,
     fromStargateAddress: selectedTokenSourceChainTokenId?.stargate,
-    fromChainProvider: sourceChainProvider,
     fromChainId: depositViewChain,
     toChainId: settlementChainId,
   });

src/components/GmxAccountModal/WithdrawalView.tsx

@@ -264,7 +264,6 @@ export const WithdrawalView = () => {
   const quoteOft = useQuoteOft({
     sendParams: sendParamsWithoutSlippage,
     fromStargateAddress: selectedTokenSettlementChainTokenId?.stargate,
-    fromChainProvider: provider,
     fromChainId: chainId,
     toChainId: withdrawalViewChain,
   });