@multiversx/sdk-dapp-liquidity 1.1.0-alpha.17 → 1.1.0-alpha.19

package/index.js

@@ -53,7 +53,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./reactjs/hooks/
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./reactjs/hooks/validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./reactjs/hooks/validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./reactjs/hooks/useAccount.js");
-const reactjs_hooks_useBalances = require("./useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("./useBalances-D7Fze-E_.js");
 const reactjs_hooks_useBridgeFormik = require("./reactjs/hooks/useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./reactjs/hooks/useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./reactjs/hooks/useFetchBridgeData.js");

package/index.mjs

@@ -50,7 +50,7 @@ import { useSecondAmountSchema } from "./reactjs/hooks/validation/useSecondAmoun
 import { useTestHasEnoughFunds } from "./reactjs/hooks/validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./reactjs/hooks/validation/useTestIsConnected.mjs";
 import { useAccount } from "./reactjs/hooks/useAccount.mjs";
-import { u } from "./useBalances-CvRCOieR.mjs";
+import { u } from "./useBalances-B7J7g6dD.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./reactjs/hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./reactjs/hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./reactjs/hooks/useFetchBridgeData.mjs";

package/package.json

@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/multiversx/mx-sdk-dapp-liquidity#readme",
   "license": "MIT",
-  "version": "1.1.0-alpha.17",
+  "version": "1.1.0-alpha.19",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -44,7 +44,7 @@ const reactjs_components_Connect_MvxAccountDisplay = require("../Connect/MvxAcco
 const reactjs_components_TokenSelector_TokenSelector = require("../TokenSelector/TokenSelector.js");
 const viem = require("viem");
 const actions = require("viem/actions");
-const reactjs_hooks_useBalances = require("../../../useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("../../../useBalances-D7Fze-E_.js");
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -134,6 +134,7 @@ const BridgeForm = ({
 }) => {
   var _a, _b, _c, _d, _e, _f;
   const ref = React.useRef(null);
+  const initializedInitialTokensRef = React.useRef(false);
   const [isTokenSelectorVisible, setIsTokenSelectorVisible] = React.useState(false);
   const [pendingSigning, setPendingSigning] = React.useState(false);
   const [siginingTransactionsCount, setSigningTransactionsCount] = React.useState(0);
@@ -164,7 +165,7 @@ const BridgeForm = ({
       (chain) => chain.chainId.toString() === mvxChainId.toString()
     );
   }, [chainId, chains]);
-  const { evm, solana } = reactjs_hooks_useSignTransaction.useSignTransaction();
+  const { evm, solana, bitcoin } = reactjs_hooks_useSignTransaction.useSignTransaction();
   const sendTransactions = reactjs_hooks_useSendTransactions.useSendTransactions();
   const {
     mutate: getRate,
@@ -189,30 +190,33 @@ const BridgeForm = ({
     })) ?? [],
     [evmTokensWithBalances]
   );
-  const availableTokens = React.useMemo(() => {
-    if (!(firstToken == null ? void 0 : firstToken.availableTokens)) {
-      return [];
-    }
-    const foundTokens = [];
-    for (const availableToken of firstToken.availableTokens) {
-      const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
-        (mvxToken) => mvxToken.address === availableToken.address
-      );
-      if (foundToken) {
-        foundTokens.push(foundToken);
+  const getAvailableTokens = React.useCallback(
+    (option) => {
+      if (!(option == null ? void 0 : option.availableTokens)) {
+        return [];
       }
-    }
-    return foundTokens;
-  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
+      const foundTokens = [];
+      for (const availableToken of option.availableTokens) {
+        const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+          (mvxToken) => mvxToken.address === availableToken.address
+        );
+        if (foundToken) {
+          foundTokens.push(foundToken);
+        }
+      }
+      return foundTokens;
+    },
+    [mvxTokensWithBalances]
+  );
   const toOptions = React.useMemo(
-    () => (availableTokens && availableTokens.map((token) => {
+    () => ((firstToken == null ? void 0 : firstToken.availableTokens) && getAvailableTokens(firstToken).map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [availableTokens]
+    [firstToken == null ? void 0 : firstToken.availableTokens]
   );
   const selectedChainOption = React.useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -220,9 +224,11 @@ const BridgeForm = ({
     )) ?? (chains == null ? void 0 : chains[0]),
     [activeChain == null ? void 0 : activeChain.id, chains]
   );
-  const defaultReceivingToken = React.useMemo(
-    () => (availableTokens == null ? void 0 : availableTokens[0]) ?? toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
-    [toOptions, availableTokens]
+  const getDefaultReceivingToken = React.useCallback(
+    (values) => values.find((x) => x.symbol.toLowerCase().includes("usdc")) ?? (mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.symbol.toLowerCase().includes("usdc")
+    )),
+    [mvxTokensWithBalances]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = React.useCallback(
@@ -285,7 +291,7 @@ const BridgeForm = ({
   );
   const updateUrlParams = React.useCallback(
     ({ firstTokenId, secondTokenId }) => {
-      if (isTokensLoading || !bridgeAddress) {
+      if (isTokensLoading) {
         return;
       }
       const currentUrl = reactjs_utils_getCompletePathname.getCompletePathname();
@@ -302,8 +308,14 @@ const BridgeForm = ({
       }
       onNavigate == null ? void 0 : onNavigate(newUrl, { replace: true });
     },
-    [bridgeAddress, callbackRoute, isTokensLoading, onNavigate]
+    [callbackRoute, isTokensLoading, onNavigate]
   );
+  console.log("BridgeForm", {
+    firstToken,
+    secondToken,
+    fromOptions,
+    toOptions
+  });
   const onChangeFirstSelect = React.useCallback(
     (option) => {
       if (!option) {
@@ -311,9 +323,13 @@ const BridgeForm = ({
       }
       setFirstToken(() => option);
       updateUrlParams({ firstTokenId: option == null ? void 0 : option.address });
-      const secondOption = toOptions.find(
-        (x) => x.symbol.toLowerCase() === (option == null ? void 0 : option.symbol.toLowerCase())
-      ) ?? defaultReceivingToken;
+      const availableTokens = getAvailableTokens(option);
+      const secondOption = availableTokens.find(
+        (x) => {
+          var _a2;
+          return x.symbol.toLowerCase() === ((_a2 = availableTokens == null ? void 0 : availableTokens[0]) == null ? void 0 : _a2.symbol.toLowerCase());
+        }
+      ) ?? getDefaultReceivingToken(availableTokens);
       if (!secondOption) {
         return;
       }
@@ -342,7 +358,7 @@ const BridgeForm = ({
   );
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
-    if (isTokensLoading) {
+    if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
     const initialTokens = reactjs_utils_getInitialTokens.getInitialTokens();
@@ -353,31 +369,37 @@ const BridgeForm = ({
         var _a3;
         return option.chainId.toString() === ((_a3 = activeChain == null ? void 0 : activeChain.id) == null ? void 0 : _a3.toString());
       }
-    );
-    const secondOption = (toOptions == null ? void 0 : toOptions.find(
+    ) ?? (fromOptions == null ? void 0 : fromOptions[0]);
+    const availableTokens = getAvailableTokens(firstOption);
+    const secondOption = (availableTokens == null ? void 0 : availableTokens.find(
       ({ address }) => {
         var _a3;
         return address.toLowerCase() === ((_a3 = (firstOption == null ? void 0 : firstOption.symbol) ?? (initialTokens == null ? void 0 : initialTokens.secondTokenId)) == null ? void 0 : _a3.toLowerCase());
       }
-    )) ?? toOptions.find(
+    )) ?? availableTokens.find(
       (x) => x.symbol.toLowerCase() === (firstOption == null ? void 0 : firstOption.symbol.toLowerCase())
-    ) ?? defaultReceivingToken;
+    ) ?? getDefaultReceivingToken(availableTokens);
     const hasOptionsSelected = Boolean(firstToken) && Boolean(secondToken) && ((_a2 = firstToken == null ? void 0 : firstToken.address) == null ? void 0 : _a2.toLowerCase()) === ((_b2 = firstOption == null ? void 0 : firstOption.address) == null ? void 0 : _b2.toLowerCase()) && ((_c2 = secondToken == null ? void 0 : secondToken.address) == null ? void 0 : _c2.toLowerCase()) === ((_d2 = secondOption == null ? void 0 : secondOption.address) == null ? void 0 : _d2.toLowerCase());
     if (hasOptionsSelected) {
       return;
     }
+    let initializedFirstToken = false;
     if (firstOption) {
       setFirstToken(firstOption);
       updateUrlParams({
         firstTokenId: firstOption == null ? void 0 : firstOption.address
       });
+      initializedFirstToken = true;
     }
+    let initializedSecondToken = false;
     if (secondOption) {
       setSecondToken(secondOption);
       updateUrlParams({
         secondTokenId: secondOption == null ? void 0 : secondOption.address
       });
+      initializedSecondToken = true;
     }
+    initializedInitialTokensRef.current = initializedFirstToken && initializedSecondToken;
   };
   const onSubmit = React.useCallback(
     async ({
@@ -391,14 +413,42 @@ const BridgeForm = ({
         let txIndex = -1;
         for (const transaction of transactions) {
           ++txIndex;
-          let txHash;
           try {
             switch (selectedChainOption == null ? void 0 : selectedChainOption.chainType) {
+              case types_chainType.ChainType.evm:
+                const hash = await evm.signTransaction({
+                  ...transaction,
+                  value: BigInt(transaction.value),
+                  gas: BigInt(transaction.gasLimit),
+                  account: bridgeAddress
+                });
+                if (!hash) {
+                  break;
+                }
+                signedTransactions.push({
+                  ...transaction,
+                  txHash: hash
+                });
+                if (txIndex === transactions.length - 1 || !hash) {
+                  break;
+                }
+                const transactionReceipt = await waitForTransactionReceipt(
+                  config,
+                  {
+                    confirmations: 1,
+                    hash
+                  }
+                );
+                console.info({
+                  transactionReceipt,
+                  hash
+                });
+                break;
               case types_chainType.ChainType.sol:
                 if (!transaction.instructions || !transaction.feePayer) {
                   break;
                 }
-                txHash = await solana.signTransaction({
+                const txHash = await solana.signTransaction({
                   feePayer: transaction.feePayer,
                   instructions: transaction.instructions
                 });
@@ -410,16 +460,20 @@ const BridgeForm = ({
                   txHash
                 });
                 break;
-              case types_chainType.ChainType.evm:
-                txHash = await evm.signTransaction({
-                  ...transaction,
-                  value: BigInt(transaction.value),
-                  gas: BigInt(transaction.gasLimit),
-                  account: bridgeAddress
+              case types_chainType.ChainType.btc:
+                if (!transaction.bitcoinParams) {
+                  console.error("No bitcoin params");
+                  break;
+                }
+                console.log({
+                  transaction
                 });
+                const psbt = await bitcoin.signTransaction(
+                  transaction.bitcoinParams
+                );
                 signedTransactions.push({
                   ...transaction,
-                  txHash
+                  txHash: psbt
                 });
                 break;
               default:
@@ -430,17 +484,6 @@ const BridgeForm = ({
             setSigningTransactionsCount(
               () => transactions.length - 1 - txIndex
             );
-            if (txIndex === transactions.length - 1 || !txHash || (selectedChainOption == null ? void 0 : selectedChainOption.chainType) !== types_chainType.ChainType.evm) {
-              continue;
-            }
-            const transactionReceipt = await waitForTransactionReceipt(config, {
-              confirmations: 1,
-              hash: txHash
-            });
-            console.info({
-              transactionReceipt,
-              hash: txHash
-            });
           } catch (e) {
             reactToastify.toast.dismiss();
             reactToastify.toast.error("Transaction aborted");
@@ -531,12 +574,7 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  React.useEffect(setInitialSelectedTokens, [
-    isTokensLoading,
-    fromOptions,
-    toOptions,
-    chainId
-  ]);
+  React.useEffect(setInitialSelectedTokens, [isTokensLoading, fromOptions]);
   React.useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -41,7 +41,7 @@ import { MvxAccountDisplay } from "../Connect/MvxAccountDisplay.mjs";
 import { TokenSelector } from "../TokenSelector/TokenSelector.mjs";
 import { hexToString } from "viem";
 import { waitForTransactionReceipt as waitForTransactionReceipt$1, getTransaction, call } from "viem/actions";
-import { g as getAction } from "../../../useBalances-CvRCOieR.mjs";
+import { g as getAction } from "../../../useBalances-B7J7g6dD.mjs";
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -131,6 +131,7 @@ const BridgeForm = ({
 }) => {
   var _a, _b, _c, _d, _e, _f;
   const ref = useRef(null);
+  const initializedInitialTokensRef = useRef(false);
   const [isTokenSelectorVisible, setIsTokenSelectorVisible] = useState(false);
   const [pendingSigning, setPendingSigning] = useState(false);
   const [siginingTransactionsCount, setSigningTransactionsCount] = useState(0);
@@ -161,7 +162,7 @@ const BridgeForm = ({
       (chain) => chain.chainId.toString() === mvxChainId.toString()
     );
   }, [chainId, chains]);
-  const { evm, solana } = useSignTransaction();
+  const { evm, solana, bitcoin } = useSignTransaction();
   const sendTransactions = useSendTransactions();
   const {
     mutate: getRate,
@@ -186,30 +187,33 @@ const BridgeForm = ({
     })) ?? [],
     [evmTokensWithBalances]
   );
-  const availableTokens = useMemo(() => {
-    if (!(firstToken == null ? void 0 : firstToken.availableTokens)) {
-      return [];
-    }
-    const foundTokens = [];
-    for (const availableToken of firstToken.availableTokens) {
-      const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
-        (mvxToken) => mvxToken.address === availableToken.address
-      );
-      if (foundToken) {
-        foundTokens.push(foundToken);
+  const getAvailableTokens = useCallback(
+    (option) => {
+      if (!(option == null ? void 0 : option.availableTokens)) {
+        return [];
       }
-    }
-    return foundTokens;
-  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
+      const foundTokens = [];
+      for (const availableToken of option.availableTokens) {
+        const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+          (mvxToken) => mvxToken.address === availableToken.address
+        );
+        if (foundToken) {
+          foundTokens.push(foundToken);
+        }
+      }
+      return foundTokens;
+    },
+    [mvxTokensWithBalances]
+  );
   const toOptions = useMemo(
-    () => (availableTokens && availableTokens.map((token) => {
+    () => ((firstToken == null ? void 0 : firstToken.availableTokens) && getAvailableTokens(firstToken).map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [availableTokens]
+    [firstToken == null ? void 0 : firstToken.availableTokens]
   );
   const selectedChainOption = useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -217,9 +221,11 @@ const BridgeForm = ({
     )) ?? (chains == null ? void 0 : chains[0]),
     [activeChain == null ? void 0 : activeChain.id, chains]
   );
-  const defaultReceivingToken = useMemo(
-    () => (availableTokens == null ? void 0 : availableTokens[0]) ?? toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
-    [toOptions, availableTokens]
+  const getDefaultReceivingToken = useCallback(
+    (values) => values.find((x) => x.symbol.toLowerCase().includes("usdc")) ?? (mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.symbol.toLowerCase().includes("usdc")
+    )),
+    [mvxTokensWithBalances]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = useCallback(
@@ -282,7 +288,7 @@ const BridgeForm = ({
   );
   const updateUrlParams = useCallback(
     ({ firstTokenId, secondTokenId }) => {
-      if (isTokensLoading || !bridgeAddress) {
+      if (isTokensLoading) {
         return;
       }
       const currentUrl = getCompletePathname();
@@ -299,8 +305,14 @@ const BridgeForm = ({
       }
       onNavigate == null ? void 0 : onNavigate(newUrl, { replace: true });
     },
-    [bridgeAddress, callbackRoute, isTokensLoading, onNavigate]
+    [callbackRoute, isTokensLoading, onNavigate]
   );
+  console.log("BridgeForm", {
+    firstToken,
+    secondToken,
+    fromOptions,
+    toOptions
+  });
   const onChangeFirstSelect = useCallback(
     (option) => {
       if (!option) {
@@ -308,9 +320,13 @@ const BridgeForm = ({
       }
       setFirstToken(() => option);
       updateUrlParams({ firstTokenId: option == null ? void 0 : option.address });
-      const secondOption = toOptions.find(
-        (x) => x.symbol.toLowerCase() === (option == null ? void 0 : option.symbol.toLowerCase())
-      ) ?? defaultReceivingToken;
+      const availableTokens = getAvailableTokens(option);
+      const secondOption = availableTokens.find(
+        (x) => {
+          var _a2;
+          return x.symbol.toLowerCase() === ((_a2 = availableTokens == null ? void 0 : availableTokens[0]) == null ? void 0 : _a2.symbol.toLowerCase());
+        }
+      ) ?? getDefaultReceivingToken(availableTokens);
       if (!secondOption) {
         return;
       }
@@ -339,7 +355,7 @@ const BridgeForm = ({
   );
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
-    if (isTokensLoading) {
+    if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
     const initialTokens = getInitialTokens();
@@ -350,31 +366,37 @@ const BridgeForm = ({
         var _a3;
         return option.chainId.toString() === ((_a3 = activeChain == null ? void 0 : activeChain.id) == null ? void 0 : _a3.toString());
       }
-    );
-    const secondOption = (toOptions == null ? void 0 : toOptions.find(
+    ) ?? (fromOptions == null ? void 0 : fromOptions[0]);
+    const availableTokens = getAvailableTokens(firstOption);
+    const secondOption = (availableTokens == null ? void 0 : availableTokens.find(
       ({ address }) => {
         var _a3;
         return address.toLowerCase() === ((_a3 = (firstOption == null ? void 0 : firstOption.symbol) ?? (initialTokens == null ? void 0 : initialTokens.secondTokenId)) == null ? void 0 : _a3.toLowerCase());
       }
-    )) ?? toOptions.find(
+    )) ?? availableTokens.find(
       (x) => x.symbol.toLowerCase() === (firstOption == null ? void 0 : firstOption.symbol.toLowerCase())
-    ) ?? defaultReceivingToken;
+    ) ?? getDefaultReceivingToken(availableTokens);
     const hasOptionsSelected = Boolean(firstToken) && Boolean(secondToken) && ((_a2 = firstToken == null ? void 0 : firstToken.address) == null ? void 0 : _a2.toLowerCase()) === ((_b2 = firstOption == null ? void 0 : firstOption.address) == null ? void 0 : _b2.toLowerCase()) && ((_c2 = secondToken == null ? void 0 : secondToken.address) == null ? void 0 : _c2.toLowerCase()) === ((_d2 = secondOption == null ? void 0 : secondOption.address) == null ? void 0 : _d2.toLowerCase());
     if (hasOptionsSelected) {
       return;
     }
+    let initializedFirstToken = false;
     if (firstOption) {
       setFirstToken(firstOption);
       updateUrlParams({
         firstTokenId: firstOption == null ? void 0 : firstOption.address
       });
+      initializedFirstToken = true;
     }
+    let initializedSecondToken = false;
     if (secondOption) {
       setSecondToken(secondOption);
       updateUrlParams({
         secondTokenId: secondOption == null ? void 0 : secondOption.address
       });
+      initializedSecondToken = true;
     }
+    initializedInitialTokensRef.current = initializedFirstToken && initializedSecondToken;
   };
   const onSubmit = useCallback(
     async ({
@@ -388,14 +410,42 @@ const BridgeForm = ({
         let txIndex = -1;
         for (const transaction of transactions) {
           ++txIndex;
-          let txHash;
           try {
             switch (selectedChainOption == null ? void 0 : selectedChainOption.chainType) {
+              case ChainType.evm:
+                const hash = await evm.signTransaction({
+                  ...transaction,
+                  value: BigInt(transaction.value),
+                  gas: BigInt(transaction.gasLimit),
+                  account: bridgeAddress
+                });
+                if (!hash) {
+                  break;
+                }
+                signedTransactions.push({
+                  ...transaction,
+                  txHash: hash
+                });
+                if (txIndex === transactions.length - 1 || !hash) {
+                  break;
+                }
+                const transactionReceipt = await waitForTransactionReceipt(
+                  config,
+                  {
+                    confirmations: 1,
+                    hash
+                  }
+                );
+                console.info({
+                  transactionReceipt,
+                  hash
+                });
+                break;
               case ChainType.sol:
                 if (!transaction.instructions || !transaction.feePayer) {
                   break;
                 }
-                txHash = await solana.signTransaction({
+                const txHash = await solana.signTransaction({
                   feePayer: transaction.feePayer,
                   instructions: transaction.instructions
                 });
@@ -407,16 +457,20 @@ const BridgeForm = ({
                   txHash
                 });
                 break;
-              case ChainType.evm:
-                txHash = await evm.signTransaction({
-                  ...transaction,
-                  value: BigInt(transaction.value),
-                  gas: BigInt(transaction.gasLimit),
-                  account: bridgeAddress
+              case ChainType.btc:
+                if (!transaction.bitcoinParams) {
+                  console.error("No bitcoin params");
+                  break;
+                }
+                console.log({
+                  transaction
                 });
+                const psbt = await bitcoin.signTransaction(
+                  transaction.bitcoinParams
+                );
                 signedTransactions.push({
                   ...transaction,
-                  txHash
+                  txHash: psbt
                 });
                 break;
               default:
@@ -427,17 +481,6 @@ const BridgeForm = ({
             setSigningTransactionsCount(
               () => transactions.length - 1 - txIndex
             );
-            if (txIndex === transactions.length - 1 || !txHash || (selectedChainOption == null ? void 0 : selectedChainOption.chainType) !== ChainType.evm) {
-              continue;
-            }
-            const transactionReceipt = await waitForTransactionReceipt(config, {
-              confirmations: 1,
-              hash: txHash
-            });
-            console.info({
-              transactionReceipt,
-              hash: txHash
-            });
           } catch (e) {
             toast.dismiss();
             toast.error("Transaction aborted");
@@ -528,12 +571,7 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  useEffect(setInitialSelectedTokens, [
-    isTokensLoading,
-    fromOptions,
-    toOptions,
-    chainId
-  ]);
+  useEffect(setInitialSelectedTokens, [isTokensLoading, fromOptions]);
   useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)

package/reactjs/hooks/index.js

@@ -6,7 +6,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./validation/use
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./useAccount.js");
-const reactjs_hooks_useBalances = require("../../useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
 const reactjs_hooks_useBridgeFormik = require("./useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./useFetchBridgeData.js");

package/reactjs/hooks/index.mjs

@@ -3,7 +3,7 @@ import { useSecondAmountSchema } from "./validation/useSecondAmountSchema.mjs";
 import { useTestHasEnoughFunds } from "./validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./validation/useTestIsConnected.mjs";
 import { useAccount } from "./useAccount.mjs";
-import { u } from "../../useBalances-CvRCOieR.mjs";
+import { u } from "../../useBalances-B7J7g6dD.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./useBridgeFormik.mjs";
 import { useDebounce } from "./useDebounce.mjs";
 import { useFetchBridgeData } from "./useFetchBridgeData.mjs";

package/reactjs/hooks/useBalances.js

@@ -3,17 +3,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("@reown/appkit/react");
 require("@solana/web3.js");
+require("axios");
 require("react");
+require("../../helpers/getApiURL.js");
 require("./useGetChainId.js");
+require("../../types/chainType.js");
 require("../context/useWeb3App.js");
 require("@tanstack/react-query");
-require("axios");
 require("../queries/useGetChains.query.js");
 require("yup");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
 require("formik");
 require("../constants/index.js");
 require("@reown/appkit-adapter-solana/react");

package/reactjs/hooks/useBalances.mjs

@@ -1,16 +1,18 @@
 import "@reown/appkit/react";
 import "@solana/web3.js";
+import "axios";
 import "react";
+import "../../helpers/getApiURL.mjs";
 import "./useGetChainId.mjs";
+import "../../types/chainType.mjs";
 import "../context/useWeb3App.mjs";
 import "@tanstack/react-query";
-import "axios";
 import "../queries/useGetChains.query.mjs";
 import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u } from "../../useBalances-CvRCOieR.mjs";
+import { u } from "../../useBalances-B7J7g6dD.mjs";
 import "formik";
 import "../constants/index.mjs";
 import "@reown/appkit-adapter-solana/react";

package/reactjs/hooks/useSignTransaction.d.ts

@@ -1,5 +1,6 @@
 import { ServerTransactionInstruction } from '../../types';
 import { Provider } from '@reown/appkit-adapter-solana/react';
+import { BitcoinConnector } from '@reown/appkit-adapter-bitcoin';
 
 export declare const useSignTransaction: () => {
     evm: {
@@ -79,4 +80,16 @@ export declare const useSignTransaction: () => {
         connection: import('@solana/web3.js').Connection | undefined;
         walletProvider: Provider;
     };
+    bitcoin: {
+        signTransaction: (params: {
+            psbt: string;
+            signInputs: {
+                address: string;
+                index: number;
+                sighashTypes: number[];
+            }[];
+            broadcast: boolean;
+        }) => Promise<string>;
+        walletProvider: BitcoinConnector;
+    };
 };

package/reactjs/hooks/useSignTransaction.js

@@ -12,11 +12,12 @@ const useSignTransaction = () => {
     ...rest
   } = wagmi.useSendTransaction();
   const { connection } = react.useAppKitConnection();
-  const { walletProvider } = react$1.useAppKitProvider("solana");
-  async function signTransactionSolanaTransaction({
+  const { walletProvider: solWalletProvider } = react$1.useAppKitProvider("solana");
+  const { walletProvider: btcWalletProvider } = react$1.useAppKitProvider("bip122");
+  const signTransactionSolanaTransaction = async ({
     feePayer,
     instructions
-  }) {
+  }) => {
     for (const instruction of instructions) {
       const instructionData = Buffer.from(instruction.data);
       const sender = new web3_js.PublicKey(instruction.keys[0].pubkey);
@@ -34,9 +35,17 @@ const useSignTransaction = () => {
       if (connection) {
         transaction.recentBlockhash = (await connection.getLatestBlockhash("confirmed")).blockhash;
       }
-      return await walletProvider.signAndSendTransaction(transaction);
+      return await solWalletProvider.signAndSendTransaction(transaction);
     }
-  }
+  };
+  const signPSBT = async (params) => {
+    if (!btcWalletProvider) {
+      throw Error("user is disconnected");
+    }
+    params.signInputs = [];
+    const signature = await btcWalletProvider.signPSBT(params);
+    return signature.psbt;
+  };
   return {
     evm: {
       hash,
@@ -46,7 +55,11 @@ const useSignTransaction = () => {
     solana: {
       signTransaction: signTransactionSolanaTransaction,
       connection,
-      walletProvider
+      walletProvider: solWalletProvider
+    },
+    bitcoin: {
+      signTransaction: signPSBT,
+      walletProvider: btcWalletProvider
     }
   };
 };

package/reactjs/hooks/useSignTransaction.mjs

@@ -9,11 +9,12 @@ const useSignTransaction = () => {
     ...rest
   } = useSendTransaction();
   const { connection } = useAppKitConnection();
-  const { walletProvider } = useAppKitProvider("solana");
-  async function signTransactionSolanaTransaction({
+  const { walletProvider: solWalletProvider } = useAppKitProvider("solana");
+  const { walletProvider: btcWalletProvider } = useAppKitProvider("bip122");
+  const signTransactionSolanaTransaction = async ({
     feePayer,
     instructions
-  }) {
+  }) => {
     for (const instruction of instructions) {
       const instructionData = Buffer.from(instruction.data);
       const sender = new PublicKey(instruction.keys[0].pubkey);
@@ -31,9 +32,17 @@ const useSignTransaction = () => {
       if (connection) {
         transaction.recentBlockhash = (await connection.getLatestBlockhash("confirmed")).blockhash;
       }
-      return await walletProvider.signAndSendTransaction(transaction);
+      return await solWalletProvider.signAndSendTransaction(transaction);
     }
-  }
+  };
+  const signPSBT = async (params) => {
+    if (!btcWalletProvider) {
+      throw Error("user is disconnected");
+    }
+    params.signInputs = [];
+    const signature = await btcWalletProvider.signPSBT(params);
+    return signature.psbt;
+  };
   return {
     evm: {
       hash,
@@ -43,7 +52,11 @@ const useSignTransaction = () => {
     solana: {
       signTransaction: signTransactionSolanaTransaction,
       connection,
-      walletProvider
+      walletProvider: solWalletProvider
+    },
+    bitcoin: {
+      signTransaction: signPSBT,
+      walletProvider: btcWalletProvider
     }
   };
 };

package/reactjs/index.js

@@ -36,7 +36,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./hooks/validati
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./hooks/validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./hooks/validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./hooks/useAccount.js");
-const reactjs_hooks_useBalances = require("../useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("../useBalances-D7Fze-E_.js");
 const reactjs_hooks_useBridgeFormik = require("./hooks/useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./hooks/useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./hooks/useFetchBridgeData.js");

package/reactjs/index.mjs

@@ -33,7 +33,7 @@ import { useSecondAmountSchema } from "./hooks/validation/useSecondAmountSchema.
 import { useTestHasEnoughFunds } from "./hooks/validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./hooks/validation/useTestIsConnected.mjs";
 import { useAccount } from "./hooks/useAccount.mjs";
-import { u } from "../useBalances-CvRCOieR.mjs";
+import { u } from "../useBalances-B7J7g6dD.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./hooks/useFetchBridgeData.mjs";

package/reactjs/queries/useGetEvmTokensBalances.query.js

@@ -9,7 +9,7 @@ require("react");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-Ds5d90Cc.js");
+const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
 require("formik");
 require("axios");
 require("../context/Web3AppProvider.js");

package/reactjs/queries/useGetEvmTokensBalances.query.mjs

@@ -6,7 +6,7 @@ import "react";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u as useBalances } from "../../useBalances-CvRCOieR.mjs";
+import { u as useBalances } from "../../useBalances-B7J7g6dD.mjs";
 import "formik";
 import "axios";
 import "../context/Web3AppProvider.mjs";

package/types/transaction.d.ts

@@ -26,6 +26,15 @@ export type ServerTransaction = {
     signatures?: string[];
     feePayer?: string;
     instructions?: ServerTransactionInstruction[];
+    bitcoinParams?: {
+        psbt: string;
+        signInputs: {
+            address: string;
+            index: number;
+            sighashTypes: number[];
+        }[];
+        broadcast: boolean;
+    };
 };
 export type TransactionType = TransactionBase & {
     account: `0x${string}`;

package/types/utxo.d.ts

@@ -0,0 +1,11 @@
+export interface Utxo {
+    txid: string;
+    vout: number;
+    value: string;
+    height?: number;
+    confirmations: number;
+    address?: string;
+    path?: string;
+    lockTime?: number;
+    coinbase?: boolean;
+}

package/types/utxo.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+"use strict";

package/types/utxo.mjs

@@ -0,0 +1 @@
+

package/{useBalances-CvRCOieR.mjs → useBalances-B7J7g6dD.mjs}

@@ -1,10 +1,12 @@
 import { useAppKitAccount } from "@reown/appkit/react";
 import { Connection, PublicKey } from "@solana/web3.js";
+import axios from "axios";
 import { useMemo, useCallback } from "react";
+import { getApiURL } from "./helpers/getApiURL.mjs";
 import { useGetChainId } from "./reactjs/hooks/useGetChainId.mjs";
+import { ChainType } from "./types/chainType.mjs";
 import { useWeb3App } from "./reactjs/context/useWeb3App.mjs";
 import "@tanstack/react-query";
-import "axios";
 import { useGetChainsQuery } from "./reactjs/queries/useGetChains.query.mjs";
 import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
@@ -180,26 +182,16 @@ const useBalances = () => {
     const connection = new Connection(rpcUrl);
     const publicKey = new PublicKey(addr);
     const balance = await connection.getBalance(publicKey);
-    return {
-      value: BigInt(balance.toString()),
-      decimals: 9,
-      formatted: (balance / 1e9).toString(),
-      symbol: "SOL"
-    };
+    return BigInt(balance.toString());
   };
-  const getBtcBalance = async (rpcUrl) => {
-    const response = await fetch(rpcUrl);
-    const utxos = await response.json();
-    const balance = utxos.reduce(
-      (sum, utxo) => sum + utxo.value,
-      0
-    );
-    return {
-      value: BigInt(balance.toString()),
-      decimals: 8,
-      formatted: (balance / 1e8).toString(),
-      symbol: "BTC"
-    };
+  const getBtcBalance = async () => {
+    const url = `${getApiURL()}/user/balance/${address}`;
+    try {
+      const { data } = await axios.get(url);
+      return BigInt(data.balance);
+    } catch (error) {
+      throw new Error(`Error fetching BTC balance: ${error}`);
+    }
   };
   const fetchBalances = useCallback(
     async ({ tokens }) => {
@@ -212,29 +204,30 @@ const useBalances = () => {
             };
           }
           try {
-            let balance;
+            let balance = BigInt(0);
             switch (activeChain == null ? void 0 : activeChain.chainType) {
-              case "evm":
-                balance = await getBalance(config, {
+              case ChainType.evm:
+                balance = (await getBalance(config, {
                   address,
                   chainId: Number(chainId),
                   // omit passing the token for fetching the native currency balance
                   token: token.isNative ? void 0 : token.address
-                });
+                })).value;
                 break;
-              case "sol":
+              case ChainType.sol:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
-              case "btc":
+              case ChainType.btc:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
-                balance = await getBtcBalance(activeChain == null ? void 0 : activeChain.rpc);
+                balance = await getBtcBalance();
+                break;
+              case ChainType.mvx:
                 break;
-              case "mvx":
               default:
                 throw new Error(
                   `Unsupported chain type: ${activeChain == null ? void 0 : activeChain.chainType}`
@@ -242,7 +235,7 @@ const useBalances = () => {
             }
             return {
               tokenId: token.address,
-              balance: balance.value.toString()
+              balance: balance == null ? void 0 : balance.toString()
             };
           } catch (error) {
             console.warn("Error fetching balance for: ", token.address, error);

package/{useBalances-Ds5d90Cc.js → useBalances-D7Fze-E_.js}

@@ -2,11 +2,13 @@
 "use strict";
 const react = require("@reown/appkit/react");
 const web3_js = require("@solana/web3.js");
+const axios = require("axios");
 const React = require("react");
+const helpers_getApiURL = require("./helpers/getApiURL.js");
 const reactjs_hooks_useGetChainId = require("./reactjs/hooks/useGetChainId.js");
+const types_chainType = require("./types/chainType.js");
 const reactjs_context_useWeb3App = require("./reactjs/context/useWeb3App.js");
 require("@tanstack/react-query");
-require("axios");
 const reactjs_queries_useGetChains_query = require("./reactjs/queries/useGetChains.query.js");
 require("yup");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
@@ -182,26 +184,16 @@ const useBalances = () => {
     const connection = new web3_js.Connection(rpcUrl);
     const publicKey = new web3_js.PublicKey(addr);
     const balance = await connection.getBalance(publicKey);
-    return {
-      value: BigInt(balance.toString()),
-      decimals: 9,
-      formatted: (balance / 1e9).toString(),
-      symbol: "SOL"
-    };
+    return BigInt(balance.toString());
   };
-  const getBtcBalance = async (rpcUrl) => {
-    const response = await fetch(rpcUrl);
-    const utxos = await response.json();
-    const balance = utxos.reduce(
-      (sum, utxo) => sum + utxo.value,
-      0
-    );
-    return {
-      value: BigInt(balance.toString()),
-      decimals: 8,
-      formatted: (balance / 1e8).toString(),
-      symbol: "BTC"
-    };
+  const getBtcBalance = async () => {
+    const url = `${helpers_getApiURL.getApiURL()}/user/balance/${address}`;
+    try {
+      const { data } = await axios.get(url);
+      return BigInt(data.balance);
+    } catch (error) {
+      throw new Error(`Error fetching BTC balance: ${error}`);
+    }
   };
   const fetchBalances = React.useCallback(
     async ({ tokens }) => {
@@ -214,29 +206,30 @@ const useBalances = () => {
             };
           }
           try {
-            let balance;
+            let balance = BigInt(0);
             switch (activeChain == null ? void 0 : activeChain.chainType) {
-              case "evm":
-                balance = await getBalance(config, {
+              case types_chainType.ChainType.evm:
+                balance = (await getBalance(config, {
                   address,
                   chainId: Number(chainId),
                   // omit passing the token for fetching the native currency balance
                   token: token.isNative ? void 0 : token.address
-                });
+                })).value;
                 break;
-              case "sol":
+              case types_chainType.ChainType.sol:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
-              case "btc":
+              case types_chainType.ChainType.btc:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
-                balance = await getBtcBalance(activeChain == null ? void 0 : activeChain.rpc);
+                balance = await getBtcBalance();
+                break;
+              case types_chainType.ChainType.mvx:
                 break;
-              case "mvx":
               default:
                 throw new Error(
                   `Unsupported chain type: ${activeChain == null ? void 0 : activeChain.chainType}`
@@ -244,7 +237,7 @@ const useBalances = () => {
             }
             return {
               tokenId: token.address,
-              balance: balance.value.toString()
+              balance: balance == null ? void 0 : balance.toString()
             };
           } catch (error) {
             console.warn("Error fetching balance for: ", token.address, error);