Merge pull request #176 from skip-mev/staging

package.json

@@ -56,7 +56,7 @@
     "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/nextjs": "^7.99.0",
-    "@skip-router/core": "^1.3.0",
+    "@skip-router/core": "^1.3.2",
     "@tailwindcss/forms": "^0.5.7",
     "@tanstack/query-sync-storage-persister": "^5.18.1",
     "@tanstack/react-query": "^5.18.1",

src/components/TransactionDialog/TransactionDialogContent.tsx

@@ -13,6 +13,7 @@ import { useBroadcastedTxsStatus, useSkipClient } from "@/solve";
 import { getChainGasPrice } from "@/utils/chain.client";
 import { isUserRejectedRequestError } from "@/utils/error";
 import { getExplorerUrl } from "@/utils/explorer";
+import { isCCTPLedgerBrokenInOperation, isEthermintLedgerInOperation } from "@/utils/ledger-warning";
 import { randomId } from "@/utils/random";
 import { cn } from "@/utils/ui";
 
@@ -35,12 +36,6 @@ export interface BroadcastedTx {
   explorerLink: string;
 }
 
-const isCCTPFromNobleInOperation = (route: RouteResponse) => {
-  return route.operations.some(
-    (operation) => "cctpTransfer" in operation && operation.cctpTransfer.fromChainID === "noble-1",
-  );
-};
-
 function TransactionDialogContent({ route, onClose, isAmountError, transactionCount }: Props) {
   const skipClient = useSkipClient();
 
@@ -58,7 +53,10 @@ function TransactionDialogContent({ route, onClose, isAmountError, transactionCo
   const srcAccount = useAccount("source");
   const dstAccount = useAccount("destination");
 
-  const showLedgerWarning = isCCTPFromNobleInOperation(route) && srcAccount?.wallet?.mode === "ledger";
+  const showCCTPLedgerWarning = isCCTPLedgerBrokenInOperation(route) && srcAccount?.wallet?.isLedger;
+  const showEthermintLikeLedgerWarning = isEthermintLedgerInOperation(route) && srcAccount?.wallet?.isLedger;
+
+  const showLedgerWarning = showCCTPLedgerWarning || showEthermintLikeLedgerWarning;
 
   const { data: userAddresses } = useWalletAddresses(route.chainIDs);
 
@@ -253,7 +251,7 @@ function TransactionDialogContent({ route, onClose, isAmountError, transactionCo
             </AlertCollapse.Content>
           </AlertCollapse.Root>
         )}
-        {showLedgerWarning && (
+        {showCCTPLedgerWarning && (
           <AlertCollapse.Root
             type="warning"
             initialOpen={true}
@@ -262,7 +260,23 @@ function TransactionDialogContent({ route, onClose, isAmountError, transactionCo
               <p>
                 <b>WARNING: </b>
                 ibc.fun does not support signing with Ledger when transferring over CCTP to the Ethereum ecosystem.
-                We&apos;re actively working on fixing this. We apologize for the inconvenience
+                We&apos;re actively working on fixing this with the Noble/Circle teams. We apologize for the
+                inconvenience
+              </p>
+            </AlertCollapse.Content>
+          </AlertCollapse.Root>
+        )}
+        {showEthermintLikeLedgerWarning && (
+          <AlertCollapse.Root
+            type="warning"
+            initialOpen={true}
+          >
+            <AlertCollapse.Content>
+              <p>
+                <b>WARNING: </b>
+                ibc.fun does not support signing with Ledger on Ethermint-like chains (e.g. Injective, Dymension, EVMOS,
+                etc...). We&apos;re actively working on fixing this with the Ledger team. We apologize for the
+                inconvenience.
               </p>
             </AlertCollapse.Content>
           </AlertCollapse.Root>

src/constants/ledger-warning.ts

@@ -0,0 +1,9 @@
+export const knownBrokenCCTPLedgerChainIds = [
+  "noble-1",
+  "evmos_9001-2",
+  "dymension_1100-1",
+  "injective-1",
+  "dimension_37-1",
+];
+
+export const knownEthermintLedgerChainIds = ["evmos_9001-2", "dymension_1100-1", "injective-1", "dimension_37-1"];

src/hooks/useAccount.ts

@@ -1,10 +1,13 @@
+import { WalletClient } from "@cosmos-kit/core";
 import { useManager as useCosmosManager } from "@cosmos-kit/react";
+import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
 import { useAccount as useWagmiAccount } from "wagmi";
 
 import { EVM_WALLET_LOGOS, INJECTED_EVM_WALLET_LOGOS } from "@/constants/wagmi";
 import { trackWallet, TrackWalletCtx, useTrackWallet } from "@/context/track-wallet";
 import { useChainByID } from "@/hooks/useChains";
+import { isWalletClientUsingLedger } from "@/utils/wallet";
 
 export function useAccount(context: TrackWalletCtx) {
   const trackedWallet = useTrackWallet(context);
@@ -20,6 +23,20 @@ export function useAccount(context: TrackWalletCtx) {
 
   const wagmiAccount = useWagmiAccount();
 
+  const getIsLedger = async (client: WalletClient, chainId: string) => {
+    const isLedger = await isWalletClientUsingLedger(client, chainId);
+    return isLedger;
+  };
+
+  const cosmosWalletIsLedgerQuery = useQuery({
+    queryKey: ["cosmosWallet", cosmosWallet, chain, cosmosWallet?.client, chain?.chainID],
+    queryFn: () => {
+      if (!cosmosWallet || !chain) return;
+      return getIsLedger(cosmosWallet.client, chain.chainID);
+    },
+    enabled: chain && chain.chainType === "cosmos" && !!cosmosWallet,
+  });
+
   const account = useMemo(() => {
     trackedWallet;
     if (!chain) return;
@@ -34,7 +51,7 @@ export function useAccount(context: TrackWalletCtx) {
               walletInfo: {
                 logo: cosmosWallet.walletInfo.logo,
               },
-              mode: cosmosWallet.walletInfo.mode,
+              isLedger: !!cosmosWalletIsLedgerQuery.data,
             }
           : undefined,
         chainType: chain.chainType,
@@ -79,7 +96,7 @@ export function useAccount(context: TrackWalletCtx) {
         },
       };
     }
-  }, [chain, context, cosmosWallet, trackedWallet, wagmiAccount]);
+  }, [chain, context, cosmosWallet, trackedWallet, wagmiAccount, cosmosWalletIsLedgerQuery.data]);
 
   return account;
 }

src/utils/ledger-warning.ts

@@ -0,0 +1,22 @@
+import { RouteResponse } from "@skip-router/core";
+
+import { knownBrokenCCTPLedgerChainIds, knownEthermintLedgerChainIds } from "@/constants/ledger-warning";
+
+export const isCCTPLedgerBrokenInOperation = (route: RouteResponse) => {
+  return route.operations.some(
+    (operation) =>
+      "cctpTransfer" in operation && knownBrokenCCTPLedgerChainIds.includes(operation.cctpTransfer.fromChainID),
+  );
+};
+
+export const isEthermintLedgerInOperation = (route: RouteResponse) => {
+  return (
+    route.operations.some(
+      (operation) => "transfer" in operation && knownEthermintLedgerChainIds.includes(operation.transfer.chainID),
+    ) ||
+    route.operations.some(
+      (operation) =>
+        "axelarTransfer" in operation && knownEthermintLedgerChainIds.includes(operation.axelarTransfer.fromChainID),
+    )
+  );
+};