@xswap-link/sdk 0.10.15 → 0.11.0

package/src/components/Swap/SwapView/SwapButton/index.tsx

@@ -31,6 +31,7 @@ export const SwapButton = () => {
     srcToken,
     dstToken,
     srcValueWei,
+    srcTokenBalanceWei,
     isFetchingRoute,
     isAsyncDataLoaded,
     hasOnConnectWalletCallback,
@@ -163,6 +164,32 @@ export const SwapButton = () => {
         disabled: false,
       };
     }
+    if (
+      srcChain?.ecosystem === Ecosystem.SOLANA &&
+      dstChain?.ecosystem === Ecosystem.EVM &&
+      !address
+    ) {
+      return {
+        text: "Connect EVM Wallet",
+        fn: () => {
+          setOpenEVMWalletModal(true);
+        },
+        disabled: false,
+      };
+    }
+    if (
+      srcChain?.ecosystem === Ecosystem.EVM &&
+      dstChain?.ecosystem === Ecosystem.SOLANA &&
+      !solana.address
+    ) {
+      return {
+        text: "Connect Solana Wallet",
+        fn: () => {
+          setOpenSolanaWalletModal(true);
+        },
+        disabled: false,
+      };
+    }
     if (
       srcChain?.ecosystem !== Ecosystem.SOLANA &&
       chainId?.toString() !== srcChainId
@@ -174,17 +201,17 @@ export const SwapButton = () => {
       };
     }
 
-    // if (
-    //   srcValueWei &&
-    //   srcTokenBalanceWei &&
-    //   safeBigNumberFrom(srcValueWei).gt(safeBigNumberFrom(srcTokenBalanceWei))
-    // ) {
-    //   return {
-    //     text: "Insufficient Balance",
-    //     fn: () => {},
-    //     disabled: true,
-    //   };
-    // }
+    if (
+      srcValueWei &&
+      srcTokenBalanceWei &&
+      safeBigNumberFrom(srcValueWei).gt(safeBigNumberFrom(srcTokenBalanceWei))
+    ) {
+      return {
+        text: "Insufficient Balance",
+        fn: () => {},
+        disabled: true,
+      };
+    }
 
     if (safeBigNumberFrom(srcValueWei || "0").lte(safeBigNumberFrom("0"))) {
       return {
@@ -237,6 +264,7 @@ export const SwapButton = () => {
     isAsyncDataLoaded,
     error,
     srcChain?.ecosystem,
+    dstChain?.ecosystem,
     address,
     srcChainId,
     dstChainId,
@@ -256,6 +284,7 @@ export const SwapButton = () => {
     switchChainAsync,
     enqueueTransaction,
     approve,
+    srcTokenBalanceWei,
     routerAddress,
     getAllowance,
     setTxStatus,

package/src/components/Swap/SwapView/SwapPanel/AmountPanel/index.tsx

@@ -4,6 +4,7 @@ import { useSwapContext } from "@src/context";
 import { useMemo } from "react";
 import { SwapPanelType } from "../../../SwapView";
 import { Balance } from "./Balance";
+import { Ecosystem } from "@src/models";
 
 type Props = {
   type: SwapPanelType;
@@ -11,14 +12,39 @@ type Props = {
 
 export const AmountPanel = ({ type }: Props) => {
   const {
+    srcChain,
     srcValue,
     srcValueUsd,
+    dstToken,
+    dstChain,
     dstValue,
     dstValueUsd,
     setSrcValue,
     isFetchingRoute,
+    bridgeUI,
   } = useSwapContext();
 
+  const value = useMemo(() => {
+    if (
+      type === "destination" &&
+      dstToken &&
+      dstChain &&
+      bridgeUI &&
+      srcChain?.ecosystem === Ecosystem.SOLANA
+    ) {
+      return srcValue;
+    }
+    return type === "source" ? srcValue : dstValue;
+  }, [
+    type,
+    bridgeUI,
+    srcChain?.ecosystem,
+    srcValue,
+    dstValue,
+    dstToken,
+    dstChain,
+  ]);
+
   const valueUsd = useMemo(
     () => (type === "source" ? srcValueUsd : dstValueUsd),
     [dstValueUsd, srcValueUsd, type],
@@ -50,7 +76,7 @@ export const AmountPanel = ({ type }: Props) => {
             <div
               className={`text-xl text-t_text_secondary font-sans-bold font-bold`}
             >
-              {dstValue || 0}
+              {value || 0}
             </div>
             {valueUsd && (
               <div className={`text-sx opacity-60`}>{`$${valueUsd}`}</div>

package/src/components/Swap/SwapView/SwapPanel/TokenPanel/TokenPicker/index.tsx

@@ -27,6 +27,7 @@ import { TokenItem } from "./TokenItem";
 import { useAccount } from "wagmi";
 import { Connection, PublicKey } from "@solana/web3.js";
 import { METADATA_PROGRAM_ID } from "@src/constants";
+import { useWallet } from "@src/context/WalletProvider";
 
 type Props = {
   type: SwapPanelType;
@@ -66,6 +67,9 @@ export const TokenPicker = ({
     addTokenToChainIfNotExists,
   } = useSwapContext();
   const { address } = useAccount();
+  const {
+    solana: { address: solanaAddress },
+  } = useWallet();
   const evmContractApi = useEvmContractApi();
 
   useEffect(() => {
@@ -258,7 +262,12 @@ export const TokenPicker = ({
     if (
       !bridgeUI &&
       chain &&
-      !findTokenDataByAddressAndChain(searchValue.toLowerCase(), chain.chainId)
+      !findTokenDataByAddressAndChain(
+        chain.ecosystem === Ecosystem.EVM
+          ? searchValue.toLowerCase()
+          : searchValue,
+        chain.chainId,
+      )
     ) {
       if (chain.ecosystem === Ecosystem.EVM && isETHAddressValid(searchValue)) {
         getCustomTokenData();
@@ -321,17 +330,20 @@ export const TokenPicker = ({
     }
   }, [isOpen]);
 
-  const allTokens = useMemo(() => {
-    const calculateTokenValue = (token: TokenOption) => {
+  const calculateTokenValue = useCallback(
+    (token: TokenOption) => {
       if (!token.balance || !token.decimals) return 0;
       const balance = Number(
         ethers.utils.formatUnits(token.balance, token.decimals),
       );
       const price = tokenPrices[token.chainId]?.[token.address];
       return price ? balance * Number(price) : 0;
-    };
+    },
+    [tokenPrices],
+  );
 
-    const ownedFilteredTokens = [
+  const ownedFilteredTokens = useMemo(() => {
+    return [
       ...filteredTokens.filter((token) =>
         BigNumber.from(token?.balance || "0").gt(0),
       ),
@@ -348,13 +360,14 @@ export const TokenPicker = ({
       // If USD values are equal (or both 0), sort by priority
       return tokenB.priority - tokenA.priority;
     });
+  }, [filteredTokens, otherFilteredTokens, calculateTokenValue]);
 
+  const allTokens = useMemo(() => {
     const currentChainTokens = filteredTokens
       .filter((token) => BigNumber.from(token?.balance || "0").eq(0))
       .sort(
         (tokenDataA, tokenDataB) => tokenDataB.priority - tokenDataA.priority,
       );
-
     const otherChainTokens = otherFilteredTokens
       .filter((token) => BigNumber.from(token?.balance || "0").eq(0))
       .sort(
@@ -364,21 +377,28 @@ export const TokenPicker = ({
     // Create groups based on chain and wallet connection status
     const groups = chain
       ? [
-          ...(!!address && ownedFilteredTokens.length
+          ...(!!(address || solanaAddress) && ownedFilteredTokens.length
             ? [ownedFilteredTokens]
             : []),
           currentChainTokens,
           otherChainTokens,
         ]
       : [
-          ...(!!address && ownedFilteredTokens.length
+          ...(!!(address || solanaAddress) && ownedFilteredTokens.length
             ? [ownedFilteredTokens]
             : []),
           [...currentChainTokens, ...otherChainTokens],
         ];
 
     return groups.flat();
-  }, [filteredTokens, otherFilteredTokens, chain, address, tokenPrices]);
+  }, [
+    filteredTokens,
+    otherFilteredTokens,
+    ownedFilteredTokens,
+    chain,
+    address,
+    solanaAddress,
+  ]);
 
   const ownedTokens = useMemo(
     () => allTokens.filter((token) => token.balance?.gt(0)),
@@ -386,17 +406,39 @@ export const TokenPicker = ({
   );
 
   const tokenGroups = useMemo(() => {
+    const currentChainTokens = filteredTokens
+      .filter((token) => BigNumber.from(token?.balance || "0").eq(0))
+      .sort(
+        (tokenDataA, tokenDataB) => tokenDataB.priority - tokenDataA.priority,
+      );
+    const otherChainTokens = otherFilteredTokens
+      .filter((token) => BigNumber.from(token?.balance || "0").eq(0))
+      .sort(
+        (tokenDataA, tokenDataB) => tokenDataB.priority - tokenDataA.priority,
+      );
+
     return chain
       ? [
-          ...(!!address && ownedTokens.length ? [ownedTokens] : []),
-          filteredTokens,
-          otherFilteredTokens,
+          ...(!!(address || solanaAddress) && ownedFilteredTokens.length
+            ? [ownedFilteredTokens]
+            : []),
+          currentChainTokens,
+          otherChainTokens,
         ]
       : [
-          ...(!!address && ownedTokens.length ? [ownedTokens] : []),
-          otherFilteredTokens,
+          ...(!!(address || solanaAddress) && ownedFilteredTokens.length
+            ? [ownedFilteredTokens]
+            : []),
+          [...currentChainTokens, ...otherChainTokens],
         ];
-  }, [chain, address, ownedTokens, filteredTokens, otherFilteredTokens]);
+  }, [
+    chain,
+    address,
+    solanaAddress,
+    filteredTokens,
+    otherFilteredTokens,
+    ownedFilteredTokens,
+  ]);
 
   return showImportWarning ? (
     <>
@@ -568,7 +610,7 @@ export const TokenPicker = ({
             ) : (
               <div className="flex flex-col h-full gap-8 w-[calc(100%+32px)] mx-[-16px]">
                 <GroupedVirtuoso
-                  style={{ maxHeight: "400px", height: "100%" }}
+                  style={{ maxHeight: "700px", height: "100%" }}
                   groupCounts={tokenGroups.map((group) => group?.length)}
                   scrollerRef={(ref) => {
                     if (ref) {
@@ -586,7 +628,7 @@ export const TokenPicker = ({
                             // chain is selected
                             switch (index) {
                               case 0: {
-                                if (!address) {
+                                if (!address && !solanaAddress) {
                                   return `${chain.displayName} network`;
                                 }
                                 return ownedTokens.length
@@ -594,7 +636,7 @@ export const TokenPicker = ({
                                   : `${chain.displayName} network`;
                               }
                               case 1: {
-                                if (!address) {
+                                if (!address && !solanaAddress) {
                                   return "Other networks";
                                 }
                                 return `${chain.displayName} network`;

package/src/components/Swap/SwapView/WalletPicker/index.tsx

@@ -1,6 +1,11 @@
-import { CloseIcon, WalletConnectIcon } from "@src/assets/icons";
+import {
+  CloseIcon,
+  DotGreenIcon,
+  DotRedIcon,
+  WalletConnectIcon,
+} from "@src/assets/icons";
 import { FC, useCallback } from "react";
-import { Connector, useConnect } from "wagmi";
+import { Connector, useAccount, useConnect, useDisconnect } from "wagmi";
 import { useWallet as useSolanaWallet } from "@solana/wallet-adapter-react";
 import { Ecosystem } from "@src/models";
 
@@ -34,7 +39,16 @@ export const WalletPicker: FC<{
   onClose: () => void;
 }> = ({ ecosystem, className, onClose }) => {
   const { connectors, connectAsync } = useConnect();
-  const { wallets, select, connect } = useSolanaWallet();
+  const { connector: activeConnector } = useAccount();
+  const { disconnect } = useDisconnect();
+  const {
+    wallet: activeWallet,
+    wallets,
+    select,
+    connect,
+    publicKey,
+    disconnect: disconnectSolana,
+  } = useSolanaWallet();
 
   const handleEvmWalletClick = useCallback(
     async (connector: Connector) => {
@@ -78,34 +92,91 @@ export const WalletPicker: FC<{
       <div className="h-full pt-4">
         {ecosystem === Ecosystem.EVM && (
           <>
-            {connectors.map((connector) => (
-              <button
-                key={connector.id}
-                onClick={() => handleEvmWalletClick(connector)}
-                className="flex items-center w-full gap-3 mt-2 mb-2 cursor-pointer p-4  border border-solid border-white border-opacity-0 hover:selected-wallet-item"
-              >
-                <ConnectorIcon connector={connector} />
-                <div className="text-t_text_primary">{connector.name}</div>
-              </button>
-            ))}
+            {connectors.map((connector) => {
+              const isConnected = activeConnector?.id === connector.id;
+              return (
+                <button
+                  key={connector.id}
+                  onClick={async () => {
+                    isConnected
+                      ? disconnect()
+                      : await handleEvmWalletClick(connector);
+                    onClose();
+                  }}
+                  className="group flex items-center w-full gap-3 mt-2 mb-2 cursor-pointer p-4  border border-solid border-white border-opacity-0 hover:selected-wallet-item"
+                >
+                  <ConnectorIcon connector={connector} />
+                  <div className="text-t_text_primary">{connector.name}</div>
+                  {isConnected && (
+                    <>
+                      <div className="flex w-full justify-end items-baseline gap-1">
+                        <div className="group-hover:hidden">
+                          <DotGreenIcon />
+                        </div>
+                        <div className="hidden group-hover:block">
+                          <DotRedIcon />
+                        </div>
+                        <div className="text-t_text_green group-hover:hidden">
+                          connected
+                        </div>
+                        <div className="text-t_text_red hidden group-hover:block">
+                          disconnect
+                        </div>
+                      </div>
+                    </>
+                  )}
+                </button>
+              );
+            })}
           </>
         )}
         {ecosystem === Ecosystem.SOLANA && (
           <>
-            {wallets.map((wallet) => (
-              <button
-                key={wallet.adapter.name}
-                onClick={() => handleConnectSolana(wallet.adapter.name)}
-                className="flex items-center w-full gap-3 mt-2 mb-2 cursor-pointer p-4  border border-solid border-white border-opacity-0 hover:selected-wallet-item"
-              >
-                <img
-                  src={wallet.adapter.icon}
-                  alt={wallet.adapter.name}
-                  className={`w-[34px] h-[34px] rounded-md ${className || ""}`}
-                />
-                <div className="text-t_text_primary">{wallet.adapter.name}</div>
-              </button>
-            ))}
+            {wallets.map((wallet) => {
+              const isConnected =
+                publicKey && activeWallet?.adapter.name === wallet.adapter.name;
+              return (
+                <button
+                  key={wallet.adapter.name}
+                  onClick={async () => {
+                    isConnected
+                      ? await disconnectSolana()
+                      : await handleConnectSolana(wallet.adapter.name);
+                    onClose();
+                  }}
+                  className="group flex items-center w-full gap-3 mt-2 mb-2 cursor-pointer p-4  border border-solid border-white border-opacity-0 hover:selected-wallet-item"
+                >
+                  <img
+                    src={wallet.adapter.icon}
+                    alt={wallet.adapter.name}
+                    className={`w-[34px] h-[34px] rounded-md ${
+                      className || ""
+                    }`}
+                  />
+                  <div className="text-t_text_primary">
+                    {wallet.adapter.name}
+                  </div>
+                  {isConnected && (
+                    <>
+                      <div className="flex w-full justify-end items-baseline gap-1">
+                        <div className="group-hover:hidden">
+                          <DotGreenIcon />
+                        </div>
+                        <div className="hidden group-hover:block">
+                          <DotRedIcon />
+                        </div>
+                        <div className="text-t_text_green group-hover:hidden">
+                          connected
+                        </div>
+                        <div className="text-t_text_red hidden group-hover:block">
+                          disconnect
+                        </div>
+                      </div>
+                    </>
+                  )}
+                </button>
+              );
+            })}
           </>
         )}
       </div>

package/src/constants/index.ts

@@ -8,11 +8,14 @@ export const SOLANA_NATIVE_TOKEN_ADDRESS = new PublicKey(
 export const SOLANA_TOKEN_PROGRAM_ID = new PublicKey(
   "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
 );
+export const SOLANA_TOKEN_2022_PROGRAM_ID = new PublicKey(
+  "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb",
+);
 export const CCIP_ROUTER_PROGRAM_ID = new PublicKey(
-  "Ccip8ZTcM2qHjVt8FYHtuCAqjc637yLKnsJ5q5r2e6eL",
+  "Ccip842gzYHhvdDkSyi2YVCoAWPbYJoApMFzSxQroE9C",
 );
 export const FEE_QUOTER_PROGRAM_ID = new PublicKey(
-  "FeeQhewH1cd6ZyHqhfMiKAQntgzPT6bWwK26cJ5qSFo6",
+  "FeeQPGkKDeRV1MgoYfMH6L8o3KeuYjwUZrgn4LRKfjHi",
 );
 export const LINK_TOKEN_MINT = new PublicKey(
   "LinkhB3afbBKb2EQQu7s7umdZceV3wcvAUJhQAfQ23L",

package/src/context/SwapProvider.tsx

@@ -4,6 +4,7 @@ import {
   DEFAULT_REQUEST_ABORT_MSG,
   DEFAULT_SOURCE_CHAIN_ID,
   SOLANA_NATIVE_TOKEN_ADDRESS,
+  SOLANA_TOKEN_2022_PROGRAM_ID,
   SOLANA_TOKEN_PROGRAM_ID,
 } from "@src/constants";
 import { ADDRESSES } from "@src/contracts";
@@ -479,7 +480,6 @@ export const SwapProvider = ({
     if (!srcToken || !srcTokenBalanceWei || (!evmAddress && !solanaAddress)) {
       return "";
     }
-
     if (safeBigNumberFrom(srcTokenBalanceWei).eq(0)) {
       return "0";
     }
@@ -695,7 +695,15 @@ export const SwapProvider = ({
             programId: SOLANA_TOKEN_PROGRAM_ID,
           },
         );
-        const tokenAccount = tokenAccounts.value.find(
+        const token2022Accounts =
+          await connection.getParsedTokenAccountsByOwner(solanaPublicKey, {
+            programId: SOLANA_TOKEN_2022_PROGRAM_ID,
+          });
+        const allTokenAccount = [
+          ...tokenAccounts.value,
+          ...token2022Accounts.value,
+        ];
+        const tokenAccount = allTokenAccount.find(
           (account) =>
             account.account.data.parsed.info.mint === srcToken.address,
         );

package/src/services/svm/core/client/index.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
-import { TransactionInstruction } from "@solana/web3.js";
+import { TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
 import { createLogger, Logger, LogLevel } from "../../utils/logger";
 import {
   CCIPContext,
@@ -120,7 +120,10 @@ export class CCIPClient {
     request: CCIPSendRequest,
     computeBudgetInstruction?: TransactionInstruction,
     sendOptions?: CCIPSendOptions,
-  ): Promise<CCIPSendResult> {
+  ): Promise<{
+    txSignature: VersionedTransaction;
+    messageId: string;
+  }> {
     const txSignature = await this.send(
       request,
       computeBudgetInstruction,
@@ -136,6 +139,9 @@ export class CCIPClient {
     return {
       txSignature,
       messageId: eventData.messageId,
+    } as {
+      txSignature: VersionedTransaction;
+      messageId: string;
     };
   }
 

package/src/services/svm/core/client/send.ts

@@ -62,7 +62,7 @@ export async function sendCCIPMessage(
   accountReader: CCIPAccountReader,
   computeBudgetInstruction?: TransactionInstruction,
   sendOptions?: CCIPSendOptions,
-): Promise<string> {
+): Promise<VersionedTransaction> {
   if (!context.logger) {
     throw new Error("Logger is required for sendCCIPMessage");
   }
@@ -72,22 +72,12 @@ export async function sendCCIPMessage(
   const connection = context.provider.connection;
   const enhanceError = createErrorEnhancer(logger);
 
-  logger.info(
-    `Sending CCIP message to destination chain ${request.destChainSelector.toString()}`,
-  );
-
   // Determine if we're using native SOL
   const isNativeSol = request.feeToken.equals(PublicKey.default);
 
   // For native SOL, we use NATIVE_MINT as the token mint
   const feeTokenMint = isNativeSol ? NATIVE_MINT : request.feeToken;
 
-  logger.debug(
-    `Using fee token: ${feeTokenMint.toString()} (${
-      isNativeSol ? "Native SOL" : "SPL Token"
-    })`,
-  );
-
   // Determine the correct fee token program ID
   let feeTokenProgramId = TOKEN_PROGRAM_ID;
   if (!isNativeSol) {
@@ -151,18 +141,6 @@ export async function sendCCIPMessage(
     instruction.keys.push(...remainingAccounts);
   }
 
-  // Log complete instruction accounts in TRACE mode
-  logger.trace(
-    "Complete instruction accounts:",
-    instruction.keys.map((key, index) => ({
-      index,
-      pubkey: key.pubkey.toString(),
-      isSigner: key.isSigner,
-      isWritable: key.isWritable,
-    })),
-  );
-
-  // Get recent blockhash with longer validity
   const { blockhash, lastValidBlockHeight } =
     await connection.getLatestBlockhash({
       commitment: "finalized", // Using finalized for longer validity
@@ -187,28 +165,9 @@ export async function sendCCIPMessage(
   }).compileToV0Message(lookupTableList);
 
   const tx = new VersionedTransaction(messageV0);
-  await context.provider.signTransaction(tx);
-
-  // Send the transaction with improved options
-  const signature = await connection.sendTransaction(tx, {
-    skipPreflight: sendOptions?.skipPreflight ?? false,
-    preflightCommitment: "processed", // Faster preflight check
-    maxRetries: 5, // Increased retries
-  });
-
-  // Wait for transaction confirmation with improved options
-  await connection.confirmTransaction(
-    {
-      signature,
-      blockhash,
-      lastValidBlockHeight,
-    },
-    "finalized",
-  ); // Using finalized
-
-  logger.info(`CCIP message sent successfully: ${signature}`);
+  const signedTx = await context.provider.signTransaction(tx);
 
-  return signature;
+  return signedTx;
 }
 
 /**

package/src/services/svm/core/models.ts

@@ -105,7 +105,7 @@ export interface CCIPProvider {
   connection: Connection;
 
   /** Wallet or keypair for signing transactions */
-  wallet: Keypair;
+  wallet: Keypair | null;
 
   /** Get the public key address of the signer */
   getAddress(): PublicKey;

package/tsup.config.ts

@@ -8,9 +8,9 @@ export default defineConfig(() => {
       format: ["cjs", "esm"],
       dts: true,
       clean: true,
-      minify: true,
+      minify: false,
       splitting: false,
-      sourcemap: false,
+      sourcemap: true,
       noExternal: ["ethers"],
       outDir: "dist",
       esbuildOptions(options) {