@xswap-link/sdk 0.12.1 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xswap-link/sdk",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "JavaScript SDK for XSwap platform",
   "homepage": "https://github.com/xswap-link/xswap-sdk",
   "repository": {

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

@@ -11,11 +11,7 @@ import {
   crosschainEstimationTimes,
 } from "@src/constants";
 import { useHistory, useSwapContext, useTxUIWrapper } from "@src/context";
-import {
-  ADDRESSES,
-  CustomXSwapRouterAbi,
-  XSwapRouterAbi,
-} from "@src/contracts";
+import { ADDRESSES, XSwapRouterAbi } from "@src/contracts";
 import { useEvmContractApi } from "@src/hooks";
 import useNetworks from "@src/hooks/networkManagement/useNetworks";
 import {
@@ -131,11 +127,6 @@ export const TxOverview = ({ onCloseClick }: Props) => {
           "MessageSent(bytes32,uint64,address,bytes,address,uint256,uint256,address,uint256)"; // TODO think of getting this signature in a different way becase its easy to forgot about it when we will change event on smartcontract
         const messageReceivedEventSignature =
           "MessageReceived(bytes32,uint64,address,bytes,address,uint256)"; // TODO think of getting this signature in a different way because its easy to forgot about it when we will change event on smartcontract
-        // cross-chain bridge via custom xswap router
-        const messageSentXSwapCustomRouterEventSignature =
-          "MessageSent(bytes32,uint64,address,address,address,address,uint256)"; // TODO think of getting this signature in a different way becase its easy to forgot about it when we will change event on smartcontract
-        const messageReceivedXSwapCustomRouterEventSignature =
-          "MessageReceived(bytes32,uint64,address,bytes)"; // TODO think of getting this signature in a different way because its easy to forgot about it when we will change event on smartcontract
 
         const destinationChainProvider = ethers.getDefaultProvider(
           supportedChains.find(
@@ -146,7 +137,6 @@ export const TxOverview = ({ onCloseClick }: Props) => {
         );
 
         const handleMessageEvent = async (
-          contractKey: "XSwapRouter" | "CustomXSwapRouter",
           messageSentEventSignature: string,
           messageReceivedEventSignature: string,
         ) => {
@@ -159,15 +149,13 @@ export const TxOverview = ({ onCloseClick }: Props) => {
             transactionData.messageId = messageId;
 
             const xSwapRouterOnDestination = new ethers.Contract(
-              ADDRESSES[dstChain!.chainId]![contractKey]!,
-              contractKey === "XSwapRouter"
-                ? XSwapRouterAbi
-                : CustomXSwapRouterAbi,
+              ADDRESSES[dstChain!.chainId]!.XSwapRouter!,
+              XSwapRouterAbi,
               destinationChainProvider,
             );
 
             const eventFilter = {
-              address: ADDRESSES[dstChain.chainId]?.[contractKey],
+              address: ADDRESSES[dstChain.chainId]?.XSwapRouter,
               topics: [
                 ethers.utils.id(messageReceivedEventSignature),
                 messageId,
@@ -194,16 +182,9 @@ export const TxOverview = ({ onCloseClick }: Props) => {
         };
 
         await handleMessageEvent(
-          "XSwapRouter",
           messageSentEventSignature,
           messageReceivedEventSignature,
         );
-
-        await handleMessageEvent(
-          "CustomXSwapRouter",
-          messageSentXSwapCustomRouterEventSignature,
-          messageReceivedXSwapCustomRouterEventSignature,
-        );
       }
 
       addTransactionToLocalHistory(transactionData, txReceipt.from);

package/src/components/TxConfigForm/index.tsx

@@ -110,6 +110,7 @@ export const TxConfigForm = (props: TxConfigFormProps) => {
     integratorFee,
     integratorFeeReceiverAddress,
     highlightedDstTokens,
+    wagmiConfig: providedWagmiConfig,
   } = normalizedProps;
 
   const onBackdropClick = (e: MouseEvent) => {
@@ -122,8 +123,11 @@ export const TxConfigForm = (props: TxConfigFormProps) => {
   };
 
   const wagmiConfig = useMemo(
-    () => getWagmiConfig(supportedChains),
-    [supportedChains],
+    () =>
+      providedWagmiConfig ??
+      window.xPayWagmiConfig ??
+      getWagmiConfig(supportedChains),
+    [providedWagmiConfig, supportedChains],
   );
 
   useEffect(() => {
@@ -223,6 +227,7 @@ export const openTxConfigForm = async ({
   srcTokenLocked,
   srcChainLocked,
   override,
+  wagmiConfig,
 }: TxConfigFormPayload): Promise<UnifiedRoute> => {
   try {
     if (xpayRoot === null) {
@@ -267,6 +272,7 @@ export const openTxConfigForm = async ({
           srcTokenLocked={srcTokenLocked}
           srcChainLocked={srcChainLocked}
           override={override}
+          wagmiConfig={wagmiConfig}
         />,
       );
     });

package/src/components/TxWidgetWCWrapped/index.tsx

@@ -51,7 +51,13 @@ export const TxWidgetWCWrapped = ({
   integratorFee,
   integratorFeeReceiverAddress,
   highlightedDstTokens,
+  wagmiConfig,
 }: WidgetIntegrationPayload) => {
+  // Must be synchronous: the WC mounts its inner React tree before useEffect fires.
+  if (typeof window !== "undefined") {
+    window.xPayWagmiConfig = wagmiConfig;
+  }
+
   useEffect(() => {
     // We couldn't find a way to pass a function to the web component created by @r2wc/core.
     // It is assigned to window to be accessed later from within the web component.

package/src/config/wagmiConfig.ts

@@ -4,7 +4,7 @@ import { defineChain, Transport } from "viem";
 import * as WagmiChains from "viem/chains";
 import { mainnet } from "viem/chains";
 import { Config, createConfig, createStorage, http } from "@wagmi/core";
-import { walletConnect } from "@wagmi/connectors";
+import { injected, walletConnect } from "@wagmi/connectors";
 
 const storage = createStorage({
   key: "xpay.wagmi.store",
@@ -18,6 +18,7 @@ export const getWagmiConfig = (supportedChains: Chain[]): Config => {
     chains,
     transports,
     connectors: [
+      injected(),
       walletConnect({
         projectId: "c392898b45ac587a280b5eb33e92aeb0",
         showQrModal: true,

package/src/context/SwapProvider.tsx

@@ -8,7 +8,7 @@ import {
   SOLANA_TOKEN_2022_PROGRAM_ID,
   SOLANA_TOKEN_PROGRAM_ID,
 } from "@src/constants";
-import { ADDRESSES } from "@src/contracts";
+import { ADDRESSES, resolveBridgeDisplayToken } from "@src/contracts";
 import {
   BridgeToken,
   BridgeTokensDictionary,
@@ -383,8 +383,15 @@ export const SwapProvider = ({
         // Skip invalid token pairs.
         continue;
       }
-      const [chainId0, address0] = entries[0]!;
-      const [chainId1, address1] = entries[1]!;
+      const [chainId0, rawAddress0] = entries[0]!;
+      const [chainId1, rawAddress1] = entries[1]!;
+
+      // Some pairs use an internal, CCIP-connected token (e.g. a wrapped
+      // variant) that the backend relies on for routing. In the bridge UI we
+      // display/select the user-facing token instead; the backend wraps it into
+      // the CCIP token when building the route.
+      const address0 = resolveBridgeDisplayToken(chainId0, rawAddress0);
+      const address1 = resolveBridgeDisplayToken(chainId1, rawAddress1);
 
       addMapping(chainId0, address0, chainId1, address1);
       addMapping(chainId1, address1, chainId0, address0);
@@ -673,19 +680,24 @@ export const SwapProvider = ({
 
     const nonce = crypto.randomUUID();
     refreshSelectedTokenBalanceNonce.current = nonce;
-
     setIsFetchingBalance(true);
     let balance = "0";
     if (srcChain?.ecosystem === Ecosystem.EVM && evmAddress) {
-      const balanceUI = await getBalanceOf(
-        evmAddress,
-        srcToken.address,
-        srcChain?.publicRpcUrls[0],
-      );
-      balance = humanReadableToWei({
-        amount: balanceUI,
-        decimals: srcToken.decimals,
-      });
+      const balanceFromBackend =
+        tokenBalances[srcChain?.chainId]?.[srcToken.address];
+      if (balanceFromBackend === undefined) {
+        const balanceUI = await getBalanceOf(
+          evmAddress,
+          srcToken.address,
+          srcChain?.publicRpcUrls[0],
+        );
+        balance = humanReadableToWei({
+          amount: balanceUI,
+          decimals: srcToken.decimals,
+        });
+      } else {
+        balance = balanceFromBackend;
+      }
     } else if (srcChain?.ecosystem === Ecosystem.SOLANA && solanaAddress) {
       const solanaPublicKey = new PublicKey(solanaAddress);
       const connection = new Connection(srcChain.publicRpcUrls[0]!);
@@ -719,7 +731,6 @@ export const SwapProvider = ({
         }
       }
     }
-
     if (nonce !== refreshSelectedTokenBalanceNonce.current) {
       return;
     }
@@ -727,7 +738,7 @@ export const SwapProvider = ({
     setSrcTokenBalanceWei(balance);
 
     setIsFetchingBalance(false);
-  }, [evmAddress, solanaAddress, srcChain, srcToken]);
+  }, [evmAddress, solanaAddress, srcChain, srcToken, tokenBalances]);
   // retrieves token details for a given token address and chain from supported tokens mapping. (including imported tokens)
   const findTokenDataByAddressAndChain = useCallback(
     (tokenAddress: string, chainId: string): Token | undefined => {
@@ -796,10 +807,8 @@ export const SwapProvider = ({
   // fetches user all token balances when a wallet address is available and supported chains are loaded.
   useEffect(() => {
     let isCancelled = false;
-
     if ((evmAddress || solanaAddress) && supportedChains.length > 0) {
       setIsFetchingBalances(true);
-
       getBalances({
         walletAddress: evmAddress,
         solanaWalletAddress: solanaAddress,

package/src/contracts/abi/index.ts

@@ -2,12 +2,10 @@ import BatchQuery from "./BatchQuery.json";
 import ERC20 from "./ERC20.json";
 import XSwapRouter from "./XSwapRouter.json";
 import XSwapTokenFeeDistributor from "./XSwapTokenFeeDistributor.json";
-import CustomXSwapRouter from "./CustomXSwapRouter.json";
 import StakingStableAPR from "./StakingStableAPR.json";
 
 export const BatchQueryAbi = BatchQuery;
 export const ERC20Abi = ERC20;
 export const XSwapRouterAbi = XSwapRouter;
 export const XSwapTokenFeeDistributorAbi = XSwapTokenFeeDistributor;
-export const CustomXSwapRouterAbi = CustomXSwapRouter;
 export const StakingStableAPRAbi = StakingStableAPR;

package/src/contracts/addresses.ts

@@ -23,8 +23,6 @@ export const ADDRESSES: Addresses = {
   "8453": {
     [ContractName.USDC]: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
     [ContractName.BatchQuery]: "0xb5f9934ea0810ef5faa677e8c68c6983b88664b1",
-    [ContractName.CustomXSwapRouter]:
-      "0x9B64aC0aD647768838a3957Bc12c40E1C539cb93",
     [ContractName.FeeCollector]: "0xb37275558f02f05104c2ba35199d16adeb43432f",
     [ContractName.StakingCosmicCadets]:
       "0x67798736bFb7d9A1F143215E258fe15Da68c85F0",
@@ -41,8 +39,6 @@ export const ADDRESSES: Addresses = {
   "1": {
     [ContractName.USDC]: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
     [ContractName.BatchQuery]: "0xb5f9934ea0810ef5faa677e8c68c6983b88664b1",
-    [ContractName.CustomXSwapRouter]:
-      "0x9B64aC0aD647768838a3957Bc12c40E1C539cb93",
     [ContractName.FeeCollector]: "0xb37275558f02f05104c2ba35199d16adeb43432f",
     [ContractName.XSwapRouter]: "0xe1c14b9f065dead2e89ee35382f8bd42bdb87a04",
     [ContractName.XSwapToken]: "0x8fe815417913a93ea99049fc0718ee1647a2a07c",

package/src/contracts/bridgeDisplayTokens.ts

@@ -0,0 +1,46 @@
+/**
+ * Bridge UI display overrides.
+ *
+ * Some tokens returned by the `/bridgeTokens` endpoint are internal,
+ * directly-CCIP-connected tokens (e.g. a wrapped variant) that the backend
+ * relies on for routing, but that we do NOT want users to see or pick in the
+ * bridge UI. This map replaces such a CCIP token with the user-facing token we
+ * display and let users select / hold instead.
+ *
+ * The backend accepts the user-facing token in `/route` and wraps it into the
+ * CCIP token under the hood (e.g. real USDC -> XSwapUSDC via the wrapper), so
+ * the selected token is what flows through balances, approval and the route
+ * request, while the actual cross-chain hop still uses the CCIP token.
+ *
+ * Shape: { [chainId]: { [ccipTokenAddressLowercased]: displayTokenAddressLowercased } }
+ *
+ * IMPORTANT: addresses must be lowercased on both sides — the bridge dictionary
+ * and its consumers compare EVM addresses lowercased.
+ */
+export const bridgeDisplayTokenOverrides: Record<
+  string,
+  Record<string, string>
+> = {
+  // base: XSwapUSDC -> real USDC
+  "8453": {
+    "0x5426188a207fd0365dca5cff345059ff531d1aa7":
+      "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+  },
+};
+
+/**
+ * Returns the user-facing token address to display in the bridge UI for a given
+ * `/bridgeTokens` entry, or the original address when there is no override.
+ *
+ * EVM addresses are matched case-insensitively; non-EVM addresses (e.g. Solana)
+ * are returned untouched.
+ */
+export const resolveBridgeDisplayToken = (
+  chainId: string,
+  tokenAddress: string,
+): string => {
+  return (
+    bridgeDisplayTokenOverrides[chainId]?.[tokenAddress.toLowerCase()] ??
+    tokenAddress
+  );
+};

package/src/contracts/index.ts

@@ -1,2 +1,3 @@
 export * from "./abi";
 export * from "./addresses";
+export * from "./bridgeDisplayTokens";

package/src/models/Addresses.ts

@@ -9,7 +9,6 @@ export type Contracts = Partial<{
 export enum ContractName {
   USDC = "USDC",
   BatchQuery = "BatchQuery",
-  CustomXSwapRouter = "CustomXSwapRouter",
   FeeCollector = "FeeCollector",
   StakingCosmicCadets = "StakingCosmicCadets",
   StakingSolarDivision = "StakingSolarDivision",

package/src/models/payloads/ModalIntegrationPayload.ts

@@ -1,4 +1,5 @@
 import { ContractCall, Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 export type ModalIntegrationThemeStyles = {
   mainAccentLight?: string;
@@ -71,4 +72,5 @@ export type ModalIntegrationPayload = {
   integratorFee?: number;
   integratorFeeReceiverAddress?: string;
   highlightedDstTokens?: string[];
+  wagmiConfig?: Config;
 };

package/src/models/payloads/WidgetIntegrationPayload.ts

@@ -1,4 +1,5 @@
 import { ContractCall, ModalIntegrationStyles, Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 export type WidgetIntegrationPayload = {
   integratorId: string;
@@ -33,4 +34,5 @@ export type WidgetIntegrationPayload = {
   integratorFee?: number;
   integratorFeeReceiverAddress?: string;
   highlightedDstTokens?: string[];
+  wagmiConfig?: Config;
 };

package/src/services/integrations/transactions.ts

@@ -26,6 +26,7 @@ export const openTransactionModal = async ({
   onSrcChainChange,
   bridge,
   highlightedDstTokens,
+  wagmiConfig,
 }: ModalIntegrationPayload) => {
   const supportedChains: Chain[] = (await getChains()).filter(
     ({ web3Environment, swapSupported, bridgeSupported }) =>
@@ -66,6 +67,7 @@ export const openTransactionModal = async ({
     onSrcChainChange,
     bridge,
     highlightedDstTokens,
+    wagmiConfig,
   });
 };
 

package/src/types/global.d.ts

@@ -1,4 +1,5 @@
 import { Transaction } from "@src/models";
+import { Config } from "@wagmi/core";
 
 declare global {
   interface Window {
@@ -12,5 +13,6 @@ declare global {
     ) => void;
     xPayOnSrcChainChange?: (chain: string | undefined) => void;
     xPayOnConnectWallet?: () => void;
+    xPayWagmiConfig?: Config;
   }
 }