@xswap-link/sdk 0.10.7 → 0.10.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xswap-link/sdk",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "description": "JavaScript SDK for XSwap platform",
   "homepage": "https://github.com/xswap-link/xswap-sdk",
   "repository": {
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.29.0",
+    "@coral-xyz/borsh": "^0.31.1",
     "@ethersproject/providers": "^5.7.2",
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-regular-svg-icons": "^6.4.2",
@@ -45,19 +46,21 @@
     "@wagmi/core": "^2.16.3",
     "async-retry": "^1.3.3",
     "bignumber.js": "4.0.4",
+    "bn.js": "^5.2.2",
     "crypto": "npm:crypto-browserify@latest",
     "date-fns": "^3.6.0",
     "ethers": "5.7.2",
     "http": "npm:http-browserify@latest",
     "https": "npm:https-browserify@latest",
+    "loglevel": "^1.9.2",
     "notistack": "^3.0.1",
     "react-error-boundary": "^4.1.0",
     "react-virtuoso": "^4.7.12",
     "stream": "npm:stream-browserify@latest",
     "url": "npm:url-browserify@latest",
-    "zlib": "npm:zlib-browserify@latest",
     "viem": "~2.29.1",
-    "wagmi": "^2.14.9"
+    "wagmi": "^2.14.9",
+    "zlib": "npm:zlib-browserify@latest"
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",

package/src/components/Swap/SwapView/ConfirmationView/TxOverview/index.tsx

@@ -1,6 +1,13 @@
 import { Button } from "@src/components";
 import {
+  CCIP_ROUTER_PROGRAM_ID,
   FALLBACK_CROSSCHAIN_ESTIMATION_TIME,
+  FEE_QUOTER_PROGRAM_ID,
+  LINK_TOKEN_MINT,
+  PROGRAM_ID,
+  RMN_REMOTE_PROGRAM_ID,
+  SOLANA_MAINNET_RPC_URL,
+  SYSTEM_PROGRAM_ID,
   crosschainEstimationTimes,
 } from "@src/constants";
 import { useHistory, useSwapContext, useTxUIWrapper } from "@src/context";
@@ -21,7 +28,20 @@ import { Header } from "./Header";
 import { Steps } from "./Steps";
 import { SwapPanel } from "./SwapPanel";
 import { useWallet } from "@solana/wallet-adapter-react";
-import { VersionedTransaction } from "@solana/web3.js";
+import {
+  Connection,
+  Keypair,
+  PublicKey,
+  VersionedTransaction,
+} from "@solana/web3.js";
+import {
+  CCIPClient,
+  CCIPContext,
+  CCIPCoreConfig,
+  CCIPProvider,
+  CCIPSendRequest,
+} from "@src/services/svm";
+import BigNumber from "bignumber.js";
 
 type Props = {
   onCloseClick: () => void;
@@ -38,6 +58,7 @@ export const TxOverview = ({ onCloseClick }: Props) => {
     dstValueWei,
     route,
     refreshBalance,
+    bridgeUI,
   } = useSwapContext();
 
   const {
@@ -53,7 +74,7 @@ export const TxOverview = ({ onCloseClick }: Props) => {
 
   const {
     networks: {
-      evm: { signer },
+      evm: { signer, address: evmAddress },
     },
   } = useNetworks();
   const wallet = useWallet();
@@ -186,8 +207,8 @@ export const TxOverview = ({ onCloseClick }: Props) => {
   );
 
   const enqueueSwapTx = useCallback(async () => {
-    if (srcToken && route) {
-      if (route.ecosystem === Ecosystem.EVM) {
+    if (srcToken) {
+      if (route && route.ecosystem === Ecosystem.EVM) {
         const enqueueSwap = () => {
           enqueueTransaction({
             executeTransaction: () => {
@@ -247,10 +268,81 @@ export const TxOverview = ({ onCloseClick }: Props) => {
           setTxNeedsApproval(false);
           enqueueSwap();
         }
-      } else if (route.ecosystem === Ecosystem.SOLANA) {
+      } else if (srcChain?.ecosystem === Ecosystem.SOLANA) {
         enqueueTransaction({
-          executeTransaction: () => {
-            if (!route.swapTransaction || !wallet) {
+          executeTransaction: async () => {
+            if (bridgeUI) {
+              // this section should be removed when we will implement cross-chain swap on solana
+              const connection = new Connection(
+                SOLANA_MAINNET_RPC_URL,
+                "confirmed",
+              );
+
+              const provider: CCIPProvider = {
+                connection,
+                wallet: Keypair.generate(),
+                getAddress() {
+                  return wallet.publicKey || PublicKey.default;
+                },
+                async signTransaction(tx: VersionedTransaction) {
+                  const signedTransaction = await wallet.signTransaction?.(tx);
+                  if (!signedTransaction) {
+                    throw new Error("Failed to sign the transaction.");
+                  }
+                  return signedTransaction;
+                },
+              };
+
+              const config: CCIPCoreConfig = {
+                ccipRouterProgramId: CCIP_ROUTER_PROGRAM_ID,
+                feeQuoterProgramId: FEE_QUOTER_PROGRAM_ID,
+                tokenMint: new PublicKey(srcToken.address),
+                rmnRemoteProgramId: RMN_REMOTE_PROGRAM_ID,
+                linkTokenMint: LINK_TOKEN_MINT,
+                nativeSol: PublicKey.default,
+                systemProgramId: SYSTEM_PROGRAM_ID,
+                programId: PROGRAM_ID,
+              };
+
+              const context: CCIPContext = {
+                provider,
+                config,
+              };
+
+              const client = new CCIPClient(context);
+
+              const extraArgs = client.createExtraArgs({
+                gasLimit: 0,
+                allowOutOfOrderExecution: true,
+              });
+
+              if (!dstToken) return undefined;
+
+              const sendRequest: CCIPSendRequest = {
+                destChainSelector: new BigNumber(dstChain?.ccipChainId ?? ""),
+                receiver: Buffer.from(
+                  evmAddress && evmAddress.startsWith("0x")
+                    ? evmAddress.slice(2)
+                    : evmAddress || "",
+                  "hex",
+                ),
+                data: Buffer.alloc(0),
+                tokenAmounts: [
+                  {
+                    token: new PublicKey(srcToken.address),
+                    amount: new BigNumber(srcValueWei.toString()), // TODO: Check if this is correct, probably not
+                  },
+                ],
+                feeToken: PublicKey.default,
+                extraArgs: extraArgs,
+              };
+
+              const result = await client.sendWithMessageId(sendRequest);
+              console.log(`Message sent! Transaction: ${result.txSignature}`);
+              console.log(`Message ID: ${result.messageId}`);
+            }
+
+            if (!route || !route.swapTransaction || !wallet) {
               return;
             }
 
@@ -274,18 +366,23 @@ export const TxOverview = ({ onCloseClick }: Props) => {
   }, [
     srcToken,
     route,
+    srcChain?.ecosystem,
+    srcChain?.chainId,
     enqueueTransaction,
     signer,
     evmContractApi,
     setTxStatus,
     refreshBalance,
     trackTransaction,
-    srcChain?.chainId,
     dstChain?.chainId,
-    dstToken?.address,
+    dstChain?.ccipChainId,
+    dstToken,
     dstValueWei,
     setTxNeedsApproval,
+    bridgeUI,
     wallet,
+    evmAddress,
+    srcValueWei,
   ]);
 
   return (

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

@@ -175,17 +175,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 {

package/src/components/TxDataCard/TxDataCardUI/index.tsx

@@ -32,22 +32,16 @@ export const TxDataCardUI = ({
 
   const date = getDate(transaction.timestamp);
 
-  const transferredAmount =
-    transaction.sourceChainId === "mainnet-beta"
-      ? transaction.amountWei
-      : weiToHumanReadable({
-          amount: transaction.amountWei,
-          decimals: srcToken?.decimals || 18,
-          precisionFractionalPlaces: 4,
-        });
-  const receivedAmount =
-    transaction.sourceChainId === "mainnet-beta"
-      ? (transaction.tokenOutAmount as string)
-      : weiToHumanReadable({
-          amount: transaction?.tokenOutAmount || "0",
-          decimals: dstToken?.decimals || 18,
-          precisionFractionalPlaces: 4,
-        });
+  const transferredAmount = weiToHumanReadable({
+    amount: transaction.amountWei,
+    decimals: srcToken?.decimals || 18,
+    precisionFractionalPlaces: 4,
+  });
+  const receivedAmount = weiToHumanReadable({
+    amount: transaction?.tokenOutAmount || "0",
+    decimals: dstToken?.decimals || 18,
+    precisionFractionalPlaces: 4,
+  });
 
   const srcChain = supportedChains.find(
     (chain) => chain.chainId === transaction.sourceChainId,
@@ -84,11 +78,11 @@ export const TxDataCardUI = ({
             </div>
           ) : transaction.status === "DONE" ? (
             <div className="flex items-center grow justify-end text-xs">
-              <div className=" mr-1 text-t_text_green">Done</div>
+              <div className="mr-1 text-t_text_green">Done</div>
             </div>
           ) : transaction.status === "REVERTED" ? (
             <div className="flex items-center grow justify-end text-xs">
-              <div className="w-4 h-4 mr-1 text-t_text_red">Reverted</div>
+              <div className="mr-1 text-t_text_red">Reverted</div>
             </div>
           ) : null}
 

package/src/components/TxDataCard/index.tsx

@@ -10,12 +10,16 @@ export const TxDataCard = ({ transaction }: Props) => {
   const { supportedChains, findTokenDataByAddressAndChain } = useSwapContext();
 
   const srcToken = findTokenDataByAddressAndChain(
-    transaction.tokenAddress.toLowerCase(),
+    transaction.sourceChainId === "mainnet-beta"
+      ? transaction.tokenAddress
+      : transaction.tokenAddress.toLowerCase(),
     transaction.sourceChainId,
   );
   const dstToken = transaction.tokenOutAddress
     ? findTokenDataByAddressAndChain(
-        transaction.tokenOutAddress?.toLowerCase(),
+        transaction.sourceChainId === "mainnet-beta"
+          ? transaction.tokenOutAddress
+          : transaction.tokenOutAddress?.toLowerCase(),
         transaction.targetChainId,
       )
     : undefined;

package/src/constants/index.ts

@@ -8,10 +8,27 @@ export const SOLANA_NATIVE_TOKEN_ADDRESS = new PublicKey(
 export const SOLANA_TOKEN_PROGRAM_ID = new PublicKey(
   "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
 );
+export const CCIP_ROUTER_PROGRAM_ID = new PublicKey(
+  "Ccip842gzYHhvdDkSyi2YVCoAWPbYJoApMFzSxQroE9C",
+);
+export const FEE_QUOTER_PROGRAM_ID = new PublicKey(
+  "FeeQhewH1cd6ZyHqhfMiKAQntgzPT6bWwK26cJ5qSFo6",
+);
+export const LINK_TOKEN_MINT = new PublicKey(
+  "LinkhB3afbBKb2EQQu7s7umdZceV3wcvAUJhQAfQ23L",
+);
+export const SYSTEM_PROGRAM_ID = new PublicKey(
+  "11111111111111111111111111111111",
+);
+export const PROGRAM_ID = new PublicKey(
+  "52XvWQKuZHRjnR7qHsEGE532jqgQ3MBiBMgVkBowP1LD",
+);
+export const RMN_REMOTE_PROGRAM_ID = new PublicKey(
+  "RmnXLft1mSEwDgMKu2okYuHkiazxntFFcZFrrcXxYg7",
+);
 export const METADATA_PROGRAM_ID =
   "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s";
-export const SOLANA_MAINNET_RPC_URL =
-  "https://orbital-thrilling-water.solana-mainnet.quiknode.pro/6b4a6d73d2cbe0590ce45bad3b375b183acef83f/";
+export const SOLANA_MAINNET_RPC_URL = "https://api.mainnet-beta.solana.com";
 export const JUPITER_V6_PROGRAM_ID = new PublicKey(
   "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4",
 );

package/src/context/SwapProvider.tsx

@@ -543,7 +543,8 @@ export const SwapProvider = ({
       !dstToken ||
       !srcValueWei ||
       safeBigNumberFrom(srcValueWei).eq(0) ||
-      (bridgeUI && !bridgeTokensDictionary)
+      (bridgeUI && !bridgeTokensDictionary) ||
+      (bridgeUI && srcChain.ecosystem !== Ecosystem.EVM)
     ) {
       setRoute(undefined);
       return;
@@ -601,7 +602,11 @@ export const SwapProvider = ({
             fromAddress:
               evmAddress || ADDRESSES[srcChain.chainId]?.FeeCollector || "",
             toAddress:
-              evmAddress || ADDRESSES[dstChain.chainId]?.FeeCollector || "",
+              dstChain.ecosystem === Ecosystem.SOLANA
+                ? solanaAddress ||
+                  ADDRESSES[dstChain.chainId]?.FeeCollector ||
+                  ""
+                : evmAddress || ADDRESSES[dstChain.chainId]?.FeeCollector || "",
             fromToken: srcToken.address,
             toToken: dstToken.address,
             fromAmount: srcValueWei,
@@ -694,7 +699,6 @@ export const SwapProvider = ({
           (account) =>
             account.account.data.parsed.info.mint === srcToken.address,
         );
-
         if (!tokenAccount) {
           balance = "0";
         } else {

package/src/services/api.ts

@@ -16,6 +16,7 @@ import {
 } from "@src/models";
 
 let XSWAP_API_URL = "https://xswap.link/api";
+// let XSWAP_API_URL = "https://develop-72sp7lmyaa-ew.a.run.app/api/beta/";
 
 export const setApiUrl = (url: string) => {
   XSWAP_API_URL = url;

package/src/services/solana/jupiter/extract-swap-data.ts

@@ -89,8 +89,8 @@ export async function extractSolanaSwapData(
       initialPositions?.includes(index) && swap.inMint === inMint,
   );
 
-  const inAmountInDecimal = inSwapData.reduce((acc, curr) => {
-    return acc.plus(curr.inAmountInDecimal || 0);
+  const inAmount = inSwapData.reduce((acc, curr) => {
+    return acc.plus(new BigNumber(curr.inAmount || "0"));
   }, new BigNumber(0));
 
   const outMint = swapData[finalPosition]?.outMint;
@@ -98,9 +98,8 @@ export async function extractSolanaSwapData(
     (swap, index) =>
       finalPositions?.includes(index) && swap.outMint === outMint,
   );
-
-  const outAmountInDecimal = outSwapData.reduce((acc, curr) => {
-    return acc.plus(curr.outAmountInDecimal || 0);
+  const outAmount = outSwapData.reduce((acc, curr) => {
+    return acc.plus(new BigNumber(curr.outAmount || "0"));
   }, new BigNumber(0));
 
   const isSuccessful = tx.meta?.status?.Ok === null;
@@ -110,10 +109,10 @@ export async function extractSolanaSwapData(
   swap.hash = signature;
   swap.timestamp = tx.blockTime ?? 0;
 
-  swap.amountWei = inAmountInDecimal.toString();
+  swap.amountWei = inAmount.toString();
   swap.tokenAddress = inMint;
 
-  swap.tokenOutAmount = outAmountInDecimal.toString();
+  swap.tokenOutAmount = outAmount.toString();
   swap.tokenOutAddress = outMint;
 
   swap.sourceChainId = "mainnet-beta";