@xswap-link/sdk 0.9.10 → 0.10.1

package/package.json

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

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

@@ -236,21 +236,21 @@ export const TokenPicker = ({
     // Create groups based on chain and wallet connection status
     const groups = chain
       ? [
-          ...(!!address && ownedFilteredTokens.length && type === "source"
+          ...(!!address && ownedFilteredTokens.length
             ? [ownedFilteredTokens]
             : []),
           currentChainTokens,
           otherChainTokens,
         ]
       : [
-          ...(!!address && ownedFilteredTokens.length && type === "source"
+          ...(!!address && ownedFilteredTokens.length
             ? [ownedFilteredTokens]
             : []),
           [...currentChainTokens, ...otherChainTokens],
         ];
 
     return groups.flat();
-  }, [filteredTokens, otherFilteredTokens, chain, address, type, tokenPrices]);
+  }, [filteredTokens, otherFilteredTokens, chain, address, tokenPrices]);
 
   const ownedTokens = useMemo(
     () => allTokens.filter((token) => token.balance?.gt(0)),
@@ -260,19 +260,15 @@ export const TokenPicker = ({
   const tokenGroups = useMemo(() => {
     return chain
       ? [
-          ...(type === "source" && !!address && ownedTokens.length
-            ? [ownedTokens]
-            : []),
+          ...(!!address && ownedTokens.length ? [ownedTokens] : []),
           filteredTokens,
           otherFilteredTokens,
         ]
       : [
-          ...(type === "source" && !!address && ownedTokens.length
-            ? [ownedTokens]
-            : []),
+          ...(!!address && ownedTokens.length ? [ownedTokens] : []),
           otherFilteredTokens,
         ];
-  }, [chain, type, address, ownedTokens, filteredTokens, otherFilteredTokens]);
+  }, [chain, address, ownedTokens, filteredTokens, otherFilteredTokens]);
 
   return showImportWarning ? (
     <>
@@ -465,7 +461,7 @@ export const TokenPicker = ({
                                 if (!address) {
                                   return `${chain.displayName} network`;
                                 }
-                                return ownedTokens.length && type === "source"
+                                return ownedTokens.length
                                   ? "My tokens"
                                   : `${chain.displayName} network`;
                               }
@@ -489,7 +485,7 @@ export const TokenPicker = ({
                                 if (!address) {
                                   return "All networks";
                                 }
-                                return ownedTokens.length && type === "source"
+                                return ownedTokens.length
                                   ? "My tokens"
                                   : "All networks";
                               }

package/src/components/TxConfigForm/index.tsx

@@ -25,6 +25,8 @@ export type TxConfigFormPayload = Omit<
   srcTokenAddr?: string;
   dstDisplayTokenAddr?: string;
   supportedChains: Chain[];
+  integratorFee?: number;
+  integratorFeeReceiverAddress?: string;
 };
 
 const queryClient = new QueryClient();
@@ -99,6 +101,8 @@ export const TxConfigForm = ({
   bridge,
   onConnectWallet,
   override,
+  integratorFee,
+  integratorFeeReceiverAddress,
 }: TxConfigFormPayload &
   (
     | {
@@ -170,6 +174,8 @@ export const TxConfigForm = ({
                 onSrcChainChange,
                 bridge,
                 onConnectWallet,
+                integratorFee,
+                integratorFeeReceiverAddress,
               }}
               supportedChains={supportedChains}
               wagmiConfig={wagmiConfig}

package/src/components/TxWidgetWC/index.tsx

@@ -36,6 +36,8 @@ const TxWidget = ({
   onConnectWallet,
   bridge,
   override,
+  integratorFee,
+  integratorFeeReceiverAddress,
 }: WidgetIntegrationPayload) => {
   const [loading, setLoading] = useState(true);
   const [supportedChains, setSupportedChains] = useState<Chain[]>([]);
@@ -105,6 +107,8 @@ const TxWidget = ({
           onConnectWallet={onConnectWallet}
           bridge={bridge}
           override={override}
+          integratorFee={integratorFee}
+          integratorFeeReceiverAddress={integratorFeeReceiverAddress}
         />
       )}
     </>
@@ -149,6 +153,8 @@ export const createTxWidgetWC = () => {
       onSrcTokenChange: "function",
       onSrcChainChange: "function",
       override: "json",
+      integratorFee: "number",
+      integratorFeeReceiverAddress: "string",
     },
   });
 
@@ -185,4 +191,8 @@ export type TxWidgetWCAttributes = {
   "on-src-chain-change"?: WidgetIntegrationPayload["onSrcChainChange"];
   bridge: WidgetIntegrationPayload["bridge"] | undefined;
   override: string | undefined;
+  "integrator-fee": WidgetIntegrationPayload["integratorFee"] | undefined;
+  "integrator-fee-receiver-address":
+    | WidgetIntegrationPayload["integratorFeeReceiverAddress"]
+    | undefined;
 };

package/src/components/TxWidgetWCWrapped/index.tsx

@@ -48,6 +48,8 @@ export const TxWidgetWCWrapped = ({
   onConnectWallet,
   bridge,
   override,
+  integratorFee,
+  integratorFeeReceiverAddress,
 }: WidgetIntegrationPayload) => {
   useEffect(() => {
     // We couldn't find a way to pass a function to the web component created by @r2wc/core.
@@ -86,6 +88,8 @@ export const TxWidgetWCWrapped = ({
       src-chain-locked={srcChainLocked}
       bridge={bridge}
       override={JSON.stringify(override)}
+      integrator-fee={integratorFee}
+      integrator-fee-receiver-address={integratorFeeReceiverAddress}
     ></xpay-widget>
   );
 };

package/src/context/SwapProvider.tsx

@@ -583,6 +583,9 @@ export const SwapProvider = ({
           paymentToken: constants.AddressZero,
           expressDelivery: expressDelivery,
           infiniteApproval: infiniteApproval,
+          integratorFee: integrationConfig.integratorFee,
+          integratorFeeReceiverAddress:
+            integrationConfig.integratorFeeReceiverAddress,
         },
         routeAbortController.current.signal,
       );

package/src/context/index.ts

@@ -1,4 +1,3 @@
-export * from "./GlobalDataProvider";
 export * from "./HistoryProvider";
 export * from "./SwapProvider";
 export * from "./TransactionProvider";

package/src/models/payloads/GetRoutePayload.ts

@@ -21,4 +21,6 @@ export type GetRoutePayload = {
   collectFees?: CollectFees;
   fallbackAddresses?: CoinTypeAddress[];
   infiniteApproval: boolean;
+  integratorFee?: number;
+  integratorFeeReceiverAddress?: string;
 };

package/src/models/payloads/ModalIntegrationPayload.ts

@@ -67,4 +67,6 @@ export type ModalIntegrationPayload = {
   override?: {
     apiUrl?: string;
   };
+  integratorFee?: number;
+  integratorFeeReceiverAddress?: string;
 };

package/src/models/payloads/WidgetIntegrationPayload.ts

@@ -30,4 +30,6 @@ export type WidgetIntegrationPayload = {
   override?: {
     apiUrl?: string;
   };
+  integratorFee?: number;
+  integratorFeeReceiverAddress?: string;
 };

package/src/context/GlobalDataProvider.tsx

@@ -1,165 +0,0 @@
-import { ADDRESSES } from "@src/contracts";
-import { TOTAL_QUESTS_COUNT, XSWAP_STAKING_CHAIN_ID } from "@src/constants";
-import { useXPower } from "@src/hooks";
-import {
-  Context,
-  Dispatch,
-  FC,
-  ReactNode,
-  SetStateAction,
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from "react";
-import { useAccount } from "wagmi";
-import { getFinishedLeaderboardQuests } from "@src/services";
-import { getBalanceOf } from "@src/utils";
-import { useSwapContext } from "@src/context/SwapProvider";
-import { Ecosystem } from "@src/models";
-
-export interface GlobalDataState {
-  rank: number;
-  setRank: Dispatch<SetStateAction<number>>;
-  xPower: string;
-  updateXPower: () => void;
-  xSwapBalance: string;
-  updateXSwapBalance: () => void;
-  unfinishedQuestsCount: number;
-  setUnfinishedQuestsCount: Dispatch<SetStateAction<number>>;
-}
-
-const initialValue: GlobalDataState = {
-  rank: 0,
-  setRank: () => {
-    throw new Error("GlobalDataState > setRank is not implemented");
-  },
-  xPower: "0",
-  updateXPower: () => {
-    throw new Error("GlobalDataState > updateXPower is not implemented");
-  },
-  xSwapBalance: "0",
-  updateXSwapBalance: () => {
-    throw new Error("GlobalDataState > updateXSwapBalance is not implemented");
-  },
-  unfinishedQuestsCount: 0,
-  setUnfinishedQuestsCount: () => {
-    throw new Error(
-      "GlobalDataState > setUnfinishedQuestsCount is not implemented",
-    );
-  },
-};
-
-const GlobalDataContext: Context<GlobalDataState> =
-  createContext<GlobalDataState>({
-    rank: initialValue.rank,
-    setRank: initialValue.setRank,
-    xPower: initialValue.xPower,
-    updateXPower: initialValue.updateXPower,
-    xSwapBalance: initialValue.xSwapBalance,
-    updateXSwapBalance: initialValue.updateXSwapBalance,
-    unfinishedQuestsCount: initialValue.unfinishedQuestsCount,
-    setUnfinishedQuestsCount: initialValue.setUnfinishedQuestsCount,
-  });
-
-export const GlobalDataProvider: FC<{ children: ReactNode }> = ({
-  children,
-}) => {
-  const { address } = useAccount();
-  const [unfinishedQuestsCount, setUnfinishedQuestsCount] = useState(
-    initialValue.unfinishedQuestsCount,
-  );
-  const [rank, setRank] = useState(initialValue.rank);
-  const [xPower, setXPower] = useState(initialValue.xPower);
-  const [xSwapBalance, setXSwapBalance] = useState(initialValue.xSwapBalance);
-  const { getXPower } = useXPower(XSWAP_STAKING_CHAIN_ID);
-
-  const { supportedChains } = useSwapContext();
-
-  const getFinishedQuests = useCallback(async () => {
-    if (!address) {
-      return;
-    }
-    const response = await getFinishedLeaderboardQuests({
-      walletAddress: address.toLowerCase(),
-    });
-
-    if (!response.ok) {
-      throw Error("Could not fetch quests statuses.");
-    }
-    const finishedQuestsResponse = await response.json();
-    if (finishedQuestsResponse.quests) {
-      const questsLeft = Math.max(
-        TOTAL_QUESTS_COUNT - (finishedQuestsResponse.quests.length || 0),
-        0,
-      );
-      setUnfinishedQuestsCount(questsLeft);
-    }
-  }, [address]);
-
-  const fetchXPower = useCallback(async () => {
-    if (address) {
-      const response = await getXPower(address);
-      setXPower(response);
-    } else {
-      setXPower("0");
-    }
-  }, [getXPower, address]);
-
-  const fetchXSwapBalance = useCallback(async () => {
-    const rpcUrl = supportedChains.find(
-      (chain) =>
-        chain.ecosystem === Ecosystem.EVM &&
-        chain.chainId === XSWAP_STAKING_CHAIN_ID,
-    )?.publicRpcUrls[0];
-
-    if (
-      address &&
-      rpcUrl &&
-      ADDRESSES[XSWAP_STAKING_CHAIN_ID] &&
-      ADDRESSES[XSWAP_STAKING_CHAIN_ID].XSwapToken
-    ) {
-      const response = await getBalanceOf(
-        address,
-        ADDRESSES[XSWAP_STAKING_CHAIN_ID].XSwapToken,
-        rpcUrl,
-      );
-      setXSwapBalance(response);
-    } else {
-      setXSwapBalance("0");
-    }
-  }, []);
-
-  useEffect(() => {
-    getFinishedQuests();
-  }, [getFinishedQuests]);
-
-  useEffect(() => {
-    fetchXPower();
-  }, [fetchXPower]);
-
-  useEffect(() => {
-    fetchXSwapBalance();
-  }, [fetchXSwapBalance]);
-
-  return (
-    <GlobalDataContext.Provider
-      value={{
-        rank,
-        setRank,
-        xPower,
-        updateXPower: () => fetchXPower(),
-        xSwapBalance,
-        updateXSwapBalance: () => fetchXSwapBalance(),
-        unfinishedQuestsCount,
-        setUnfinishedQuestsCount,
-      }}
-    >
-      {children}
-    </GlobalDataContext.Provider>
-  );
-};
-
-export const useGlobalData = (): GlobalDataState =>
-  useContext(GlobalDataContext);