@0xsquid/react-hooks 2.1.10 → 3.0.0-beta.0

package/dist/hooks/tokens/useBalance.js

@@ -1,78 +1,56 @@
 import { useQuery } from "@tanstack/react-query";
-import { ethers, utils } from "ethers";
-import { useAccount } from "wagmi";
+import { useAccount, usePublicClient } from "wagmi";
 import { ChainType } from "@0xsquid/squid-types";
-import { getProvider } from "@wagmi/core";
 import { useMemo } from "react";
-import { ERC20__factory } from "../../contracts/typechain/factories/ERC20__factory";
+import { useBalance } from "wagmi";
+import { useCosmosContext } from "../../core";
 import { nativeEvmTokenAddress } from "../../core/constants";
-import { useCosmosContext } from "../../core/providers/CosmosProvider";
 import { keys } from "../../core/queries/queries-keys";
-import { useCosmosForChain } from "../../hooks/cosmos/useCosmosForChain";
-import { useSwap } from "../../hooks/swap/useSwap";
-import { useAllTokensWithBalanceForChain } from "../../hooks/tokens/useTokensWithBalance";
+import { formatBNToReadable } from "../../services";
+import { useCosmosForChain } from "../cosmos/useCosmosForChain";
+import { useSwap } from "../swap/useSwap";
+import { useAllTokensWithBalanceForChain } from "./useTokensWithBalance";
 const defaultRefreshIntervalMs = 15000;
-/**
- * Fetches the balance of a user on an EVM chain.
- * The balance fetching only happens if the chain and token data are available, the user is connected, and the chain type is EVM.
- *
- * @param {boolean} enabled A flag indicating whether the balance fetching is enabled or not. Defaults to true.
- * @param {boolean} refreshIntervalMs The interval in milliseconds at which the balance is fetched. Defaults to 15000 ms.
- *
- * @returns {Object} The react query object containing the balance data (defaults to "0").
- *
- */
 export const useEvmBalance = ({ chain, token, userAddress, enabled = true, refreshIntervalMs = defaultRefreshIntervalMs, }) => {
     const { isConnected } = useAccount();
-    const balance = useQuery(keys().balance(chain?.chainId, token?.address, userAddress), async () => {
-        if (!!chain &&
-            isConnected &&
-            !!token?.address &&
-            chain.chainType === ChainType.EVM) {
-            const srcProvider = getProvider({ chainId: +(chain.chainId ?? 1) });
-            const srcTokenContract = new ethers.Contract(token?.address, ERC20__factory.abi, srcProvider);
-            if (token.address.toLowerCase() === nativeEvmTokenAddress) {
-                const nativeCurrencyBalance = await srcProvider.getBalance(userAddress);
-                return utils.formatUnits(nativeCurrencyBalance, token?.decimals);
-            }
-            try {
-                const tokenBalance = await srcTokenContract.balanceOf(userAddress);
-                return utils.formatUnits(tokenBalance, token?.decimals);
-            }
-            catch (error) {
-                return "0";
-            }
-        }
-        else {
-            return "0";
-        }
-    }, {
-        enabled: isConnected && enabled,
-        refetchInterval: 0 ? false : refreshIntervalMs,
-        retry: 2,
+    const { data: nativeOrTokenBalance } = useBalance({
+        address: userAddress,
+        chainId: Number(chain?.chainId),
+        token: token?.address === nativeEvmTokenAddress
+            ? undefined
+            : token?.address,
+        query: {
+            enabled: isConnected && enabled && !!userAddress,
+            refetchInterval: refreshIntervalMs,
+            retry: 2,
+        },
     });
+    const balance = formatBNToReadable(nativeOrTokenBalance?.value ?? "0", nativeOrTokenBalance?.decimals ?? 0);
     return { balance };
 };
 export const useNativeTokenBalanceFromChain = () => {
-    const { isConnected, address } = useAccount();
+    const { address, isConnected } = useAccount();
     const { fromChain } = useSwap();
     const chainId = fromChain?.chainId;
-    const balance = useQuery(keys().nativeBalanceBigNumber(address, chainId), async () => {
-        const srcProvider = getProvider({ chainId: +(chainId ?? 1) });
-        const nativeCurrencyBalance = await srcProvider.getBalance(address);
-        return nativeCurrencyBalance;
-    }, {
-        enabled: isConnected,
+    const { data: nativeBalanceWei } = useBalance({
+        address: address,
+        chainId: Number(chainId),
+        query: {
+            enabled: isConnected,
+        },
     });
-    return { balance };
+    const nativeBalanceFormatted = formatBNToReadable(nativeBalanceWei?.value ?? "0", nativeBalanceWei?.decimals ?? 0);
+    return { nativeBalanceWei: nativeBalanceWei?.value, nativeBalanceFormatted };
 };
 export const useNativeTokenBalanceDestinationChain = () => {
     const { isConnected, address } = useAccount();
     const { toChain } = useSwap();
     const chainId = toChain?.chainId;
+    const publicClient = usePublicClient({ chainId: +(chainId ?? 1) });
     const balance = useQuery(keys().nativeBalanceBigNumber(address, chainId), async () => {
-        const srcProvider = getProvider({ chainId: +(chainId ?? 1) });
-        const nativeCurrencyBalance = await srcProvider.getBalance(address);
+        const nativeCurrencyBalance = await publicClient?.getBalance({
+            address: address,
+        });
         return nativeCurrencyBalance;
     }, {
         enabled: isConnected,

package/dist/hooks/tokens/useBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useBalance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useBalance.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tokens/useMultiChainBalance.d.ts

@@ -13,5 +13,5 @@ export declare const useMultiChainBalance: ({ chain, token, userAddress, enabled
     userAddress?: string | undefined;
     enabled?: boolean | undefined;
 }) => {
-    balance: string | undefined;
+    balance: string;
 };

package/dist/hooks/tokens/useMultiChainBalance.js

@@ -1,5 +1,4 @@
 import { ChainType } from "@0xsquid/squid-types";
-import { useMemo } from "react";
 import { useCosmosBalance, useEvmBalance } from "../../hooks/tokens/useBalance";
 /**
  * Exposes a hook to get balance depending on the chain type (EVM or Cosmos)
@@ -30,7 +29,7 @@ export const useMultiChainBalance = ({ chain, token, userAddress, enabled = true
     /**
      * Get either EVM or cosmos Balance
      */
-    const balance = useMemo(() => chain?.chainType === ChainType.EVM ? evmBalance.data : cosmosBalance, [evmBalance.data, chain, cosmosBalance]);
+    const balance = chain?.chainType === ChainType.EVM ? evmBalance : cosmosBalance;
     return { balance };
 };
 //# sourceMappingURL=useMultiChainBalance.js.map

package/dist/hooks/tokens/useMultiChainBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMultiChainBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useMultiChainBalance.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEhF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,KAAK,EACL,KAAK,EACL,WAAW,EACX,OAAO,GAAG,IAAI,GAMf,EAAE,EAAE;IACH;;OAEG;IACH,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;QAC5C,KAAK,EAAE,KAAiB;QACxB,KAAK;QACL,WAAW,EAAE,WAAW,IAAI,EAAE;QAC9B,OAAO,EAAE,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,OAAO;KACvD,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC;QAClD,SAAS,EAAE,KAAoB;QAC/B,KAAK;QACL,WAAW;KACZ,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CACH,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EACtE,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,CACxC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"useMultiChainBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useMultiChainBalance.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEhF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,KAAK,EACL,KAAK,EACL,WAAW,EACX,OAAO,GAAG,IAAI,GAMf,EAAE,EAAE;IACH;;OAEG;IACH,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;QAC5C,KAAK,EAAE,KAAiB;QACxB,KAAK;QACL,WAAW,EAAE,WAAW,IAAI,EAAE;QAC9B,OAAO,EAAE,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,OAAO;KACvD,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC;QAClD,SAAS,EAAE,KAAoB;QAC/B,KAAK;QACL,WAAW;KACZ,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,OAAO,GACX,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC;IAElE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC,CAAC"}

package/dist/hooks/transaction/useApproval.js

@@ -1,15 +1,17 @@
-// import type { TransactionResponse } from "@0xsquid/squid-types/ethers";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { constants, ethers } from "ethers";
-import { useSigner } from "wagmi";
+import { usePublicClient, useWalletClient } from "wagmi";
 import { getPrefixKey, keys, QueryKeys } from "../../core/queries/queries-keys";
+import { nativeEvmTokenAddress } from "../../core/constants";
 import { useSquidStore } from "../store/useSquidStore";
 import { useSwap } from "../swap/useSwap";
 import { useMultiChainWallet } from "../wallet/useMultiChainWallet";
+import { useSigner } from "../wallet/useSigner";
 export const useApproval = ({ squidRoute, }) => {
-    const signer = useSigner();
+    const { data: walletClient } = useWalletClient();
+    const publicClient = usePublicClient();
     const queryClient = useQueryClient();
     const squid = useSquidStore((state) => state.squid);
+    const { evmSigner } = useSigner();
     const { fromChain, fromToken } = useSwap();
     const { connectedAddress: { address: sourceUserAddress }, } = useMultiChainWallet(fromChain);
     /**
@@ -20,6 +22,9 @@ export const useApproval = ({ squidRoute, }) => {
      */
     const routeApproved = useQuery(keys().routeApproved(squidRoute), async () => {
         try {
+            if (squidRoute?.params.fromToken === nativeEvmTokenAddress) {
+                return true;
+            }
             const { isApproved } = await squid.isRouteApproved({
                 route: squidRoute,
                 sender: sourceUserAddress,
@@ -41,44 +46,54 @@ export const useApproval = ({ squidRoute, }) => {
     // ```
     // This is why we had an unpredictable gas error for USDT approvals
     // So it needs a custom gas limit
+    //
+    // TODO: We're only doing it for USDT on Ethereum Mainnet, need to check if it's needed for USDT on other chains
     const approveSpecificTokenToZero = async (token) => {
-        if (signer.data &&
+        if (walletClient &&
             token.symbol.toLowerCase() === "usdt" &&
             token.chainId === "1" &&
             fromToken) {
-            const squidRouter = "0xce16F69375520ab01377ce7B88f5BA8C48F8D666";
-            const usdtContract = new ethers.Contract(fromToken.address, [
-                {
-                    constant: false,
-                    inputs: [
-                        { name: "_spender", type: "address" },
-                        { name: "_value", type: "uint256" },
-                    ],
-                    name: "approve",
-                    outputs: [],
-                    payable: false,
-                    stateMutability: "nonpayable",
-                    type: "function",
-                },
-                {
-                    constant: true,
-                    inputs: [
-                        { name: "_owner", type: "address" },
-                        { name: "_spender", type: "address" },
+            const fromChainRouterAddress = fromChain?.squidContracts.squidRouter;
+            const allowance = await publicClient?.readContract({
+                address: token.address,
+                abi: [
+                    {
+                        constant: true,
+                        inputs: [
+                            { name: "_owner", type: "address" },
+                            { name: "_spender", type: "address" },
+                        ],
+                        name: "allowance",
+                        outputs: [{ name: "remaining", type: "uint256" }],
+                        type: "function",
+                    },
+                ],
+                functionName: "allowance",
+                args: [
+                    sourceUserAddress,
+                    fromChainRouterAddress,
+                ],
+            });
+            if (allowance && BigInt(allowance) > 0n && publicClient) {
+                const { request } = await publicClient.simulateContract({
+                    address: token.address,
+                    abi: [
+                        {
+                            constant: false,
+                            inputs: [
+                                { name: "_spender", type: "address" },
+                                { name: "_value", type: "uint256" },
+                            ],
+                            name: "approve",
+                            outputs: [],
+                            type: "function",
+                        },
                     ],
-                    name: "allowance",
-                    outputs: [{ name: "remaining", type: "uint256" }],
-                    payable: false,
-                    stateMutability: "view",
-                    type: "function",
-                },
-            ], signer.data);
-            // Get approval amount from usdt contract
-            const allowance = (await usdtContract.allowance(sourceUserAddress, squidRouter));
-            // If allowance is greater than 0, set it to 0
-            if (allowance.gt(constants.Zero)) {
-                const approveTx = await usdtContract.approve(squidRouter, constants.Zero);
-                await approveTx.wait();
+                    functionName: "approve",
+                    args: [fromChainRouterAddress, 0n],
+                    account: sourceUserAddress,
+                });
+                await walletClient.writeContract(request);
             }
         }
         return true;
@@ -88,11 +103,14 @@ export const useApproval = ({ squidRoute, }) => {
      */
     const approveRoute = useMutation(async () => {
         try {
-            if (!!squidRoute && signer.data && fromToken) {
+            if (fromToken?.address === nativeEvmTokenAddress) {
+                return true;
+            }
+            if (!!squidRoute && walletClient && fromToken && evmSigner) {
                 await approveSpecificTokenToZero(fromToken);
                 const approved = await squid?.approveRoute({
                     route: squidRoute,
-                    signer: signer.data,
+                    signer: evmSigner,
                     // For security reasons, we don't want to allow infinite approvals in our frontends
                     executionSettings: {
                         infiniteApproval: false,

package/dist/hooks/transaction/useApproval.js.map

@@ -1 +1 @@
-{"version":3,"file":"useApproval.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useApproval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useApproval.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useApproval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,UAAU,GAGX,EAAE,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IACjD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC;IAE3C,MAAM,EACJ,gBAAgB,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,GACjD,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,MAAM,aAAa,GAAG,QAAQ,CAC5B,IAAI,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,EAChC,KAAK,IAAI,EAAE;QACT,IAAI;YACF,IAAI,UAAU,EAAE,MAAM,CAAC,SAAS,KAAK,qBAAqB,EAAE;gBAC1D,OAAO,IAAI,CAAC;aACb;YACD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,KAAM,CAAC,eAAe,CAAC;gBAClD,KAAK,EAAE,UAAW;gBAClB,MAAM,EAAE,iBAAkB;aAC3B,CAAC,CAAC;YAEH,OAAO,UAAU,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC,EACD;QACE,OAAO,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,iBAAiB;KAC7C,CACF,CAAC;IAEF,qDAAqD;IACrD,MAAM;IACN,wEAAwE;IACxE,oEAAoE;IACpE,4DAA4D;IAC5D,qEAAqE;IACrE,MAAM;IACN,mEAAmE;IACnE,iCAAiC;IACjC,EAAE;IACF,gHAAgH;IAChH,MAAM,0BAA0B,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;QACxD,IACE,YAAY;YACZ,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM;YACrC,KAAK,CAAC,OAAO,KAAK,GAAG;YACrB,SAAS,EACT;YACA,MAAM,sBAAsB,GAAG,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC;YAErE,MAAM,SAAS,GAAG,MAAM,YAAY,EAAE,YAAY,CAAC;gBACjD,OAAO,EAAE,KAAK,CAAC,OAAwB;gBACvC,GAAG,EAAE;oBACH;wBACE,QAAQ,EAAE,IAAI;wBACd,MAAM,EAAE;4BACN,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;4BACnC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;yBACtC;wBACD,IAAI,EAAE,WAAW;wBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;wBACjD,IAAI,EAAE,UAAU;qBACjB;iBACF;gBACD,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE;oBACJ,iBAAkC;oBAClC,sBAAuC;iBACxC;aACF,CAAC,CAAC;YAEH,IAAI,SAAS,IAAI,MAAM,CAAC,SAAgB,CAAC,GAAG,EAAE,IAAI,YAAY,EAAE;gBAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC;oBACtD,OAAO,EAAE,KAAK,CAAC,OAAwB;oBACvC,GAAG,EAAE;wBACH;4BACE,QAAQ,EAAE,KAAK;4BACf,MAAM,EAAE;gCACN,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gCACrC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;6BACpC;4BACD,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,UAAU;yBACjB;qBACF;oBACD,YAAY,EAAE,SAAS;oBACvB,IAAI,EAAE,CAAC,sBAAuC,EAAE,EAAE,CAAC;oBACnD,OAAO,EAAE,iBAAkC;iBAC5C,CAAC,CAAC;gBACH,MAAM,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;aAC3C;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,YAAY,GAAG,WAAW,CAC9B,KAAK,IAAI,EAAE;QACT,IAAI;YACF,IAAI,SAAS,EAAE,OAAO,KAAK,qBAAqB,EAAE;gBAChD,OAAO,IAAI,CAAC;aACb;YACD,IAAI,CAAC,CAAC,UAAU,IAAI,YAAY,IAAI,SAAS,IAAI,SAAS,EAAE;gBAC1D,MAAM,0BAA0B,CAAC,SAAS,CAAC,CAAC;gBAE5C,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,YAAY,CAAC;oBACzC,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,SAAS;oBACjB,mFAAmF;oBACnF,iBAAiB,EAAE;wBACjB,gBAAgB,EAAE,KAAK;qBACxB;iBACF,CAAC,CAAC;gBAEH,OAAO,QAAQ,CAAC;aACjB;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,KAAK,EAAE;YACd,uDAAuD;YACvD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,KAAK,CAAC;SACd;IACH,CAAC,EACD;QACE,SAAS,EAAE,GAAG,EAAE;YACd,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QACvE,CAAC;KACF,CACF,CAAC;IAEF,OAAO;QACL,aAAa;QACb,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}

package/dist/hooks/transaction/useEstimate.d.ts

@@ -1,12 +1,10 @@
 import { RouteResponse } from "@0xsquid/sdk/dist/types";
-import type { FeeCost, GasCost } from "@0xsquid/squid-types";
-import { BigNumber } from "ethers";
 export declare const useEstimate: (squidRoute?: RouteResponse["route"]) => {
     balanceFormatted: string;
     totalWithRefundEstimate: {
         totalAmount: string;
         totalAmountUSD: number;
-        feeToken: import("@0xsquid/squid-types").Token | undefined;
+        feeToken: import("@0xsquid/squid-types/dist/tokens").Token | undefined;
     };
     proposedGasDestinationAmount: {
         value: number;
@@ -14,29 +12,29 @@ export declare const useEstimate: (squidRoute?: RouteResponse["route"]) => {
     };
     swapAmountExceedsLimit: boolean;
     enoughBalanceToSwap: boolean;
-    fromToken: import("@0xsquid/squid-types").Token | undefined;
+    fromToken: any;
     fromAmount: string | undefined;
     fromAmountFormatted: string;
-    sourceChainNativeToken: import("@0xsquid/squid-types").Token | undefined;
-    destChainNativeToken: import("@0xsquid/squid-types").Token | undefined;
+    sourceChainNativeToken: any;
+    destChainNativeToken: any;
     toAmountUSD: string | undefined;
     toAmountUSDFloat: number;
     exchangeRate: string;
     toAmountMinUSD: string;
     toAmountMin: string;
     toAmount: string;
-    allFeeCosts: FeeCost[];
-    allGasCosts: GasCost[];
-    firstFeeCost: FeeCost | undefined;
-    firstGasCost: GasCost | undefined;
-    expressFeeCost: FeeCost | undefined;
-    integratorFeeCost: FeeCost | undefined;
-    expectedGasRefundCost: BigNumber;
+    allFeeCosts: import("@0xsquid/squid-types/dist/fees").FeeCost[];
+    allGasCosts: import("@0xsquid/squid-types/dist/fees").GasCost[];
+    firstFeeCost: import("@0xsquid/squid-types/dist/fees").FeeCost | undefined;
+    firstGasCost: import("@0xsquid/squid-types/dist/fees").GasCost | undefined;
+    expressFeeCost: import("@0xsquid/squid-types/dist/fees").FeeCost | undefined;
+    integratorFeeCost: import("@0xsquid/squid-types/dist/fees").FeeCost | undefined;
+    expectedGasRefundCost: bigint;
     expectedGasRefundCostUSD: string;
     sameTokenBetweenFees: boolean;
     isFromTokenNative: boolean;
-    totalNativeFees: BigNumber;
-    totalFeesInNativeTokenPlusRatio: BigNumber;
+    totalNativeFees: bigint;
+    totalFeesInNativeTokenPlusRatio: bigint;
     fromBalanceEnoughToSwap: boolean;
     minAmountValueWarnMsg: string | undefined;
     estimatedRouteDuration: {

package/dist/hooks/transaction/useEstimate.js

@@ -1,131 +1,34 @@
-import { ChainType } from "@0xsquid/squid-types";
-import { BigNumber, constants } from "ethers";
-import { formatUnits } from "ethers/lib/utils";
 import { useMemo } from "react";
-import { gasRefundMultiplier, limitTradeSizeUsd } from "../../core/constants";
-import { useNativeTokenBalanceFromChain } from "../../hooks/tokens/useBalance";
+import { limitTradeSizeUsd } from "../../core/constants";
 import { useSquidTokens } from "../../hooks/tokens/useSquidTokens";
-import { convertTokenAmountToUSD, formatSeconds } from "../../services";
-import { formatUnitsRounded } from "../../services/internal/numberService";
+import { calculateEstimateResults, calculateTotalWithRefundEstimate, getProposedGasDestinationAmount, } from "../../services/internal/estimateService";
 import { useConfigStore } from "../store/useSquidStore";
 import { useSwap } from "../swap/useSwap";
+import { useNativeTokenBalanceFromChain } from "../tokens/useBalance";
 import { useMultiChainBalance } from "../tokens/useMultiChainBalance";
 import { useSingleTokenPrice } from "../tokens/useSingleTokenPrice";
 import { useEstimateExpress } from "./useExpress";
 export const useEstimate = (squidRoute) => {
     const { collectFees, advanced } = useConfigStore((state) => state.config);
-    const { balance: nativeTokenBalanceFromChain } = useNativeTokenBalanceFromChain();
+    const { nativeBalanceWei } = useNativeTokenBalanceFromChain();
     const { tokens } = useSquidTokens();
     const { fromChain, toChain } = useSwap();
     const { expressActivatedUI } = useEstimateExpress();
-    const estimateResults = useMemo(() => {
-        const fromToken = tokens.find((t) => t.chainId === squidRoute?.params.fromChain &&
-            t.address === squidRoute?.params.fromToken);
-        const fromAmount = squidRoute?.estimate?.fromAmount;
-        const fromAmountFormatted = fromAmount
-            ? formatUnits(fromAmount, fromToken?.decimals)
-            : "";
-        const sourceChainNativeToken = tokens.find((t) => t.symbol === fromChain?.nativeCurrency.symbol &&
-            t.chainId == fromChain?.chainId);
-        const destChainNativeToken = tokens.find((t) => t.symbol === toChain?.nativeCurrency.symbol &&
-            t.chainId == toChain?.chainId);
-        const toAmountUSD = squidRoute?.estimate?.toAmountUSD;
-        const toAmountUSDFloat = toAmountUSD
-            ? parseFloat(toAmountUSD.replace(/,/g, ""))
-            : 0;
-        const exchangeRate = squidRoute?.estimate.exchangeRate ?? "0";
-        const toAmountMinUSD = squidRoute?.estimate.toAmountMinUSD ?? "0";
-        const toAmountMin = formatUnits(squidRoute?.estimate.toAmountMin ?? "0", squidRoute?.estimate.toToken.decimals);
-        const toAmount = formatUnitsRounded(squidRoute?.estimate.toAmount ?? "0", squidRoute?.estimate.toToken.decimals, 14);
-        const estimate = squidRoute?.estimate;
-        const allFeeCosts = estimate?.feeCosts ?? [];
-        const allGasCosts = estimate?.gasCosts ?? [];
-        const firstFeeCost = allFeeCosts.length > 0 ? allFeeCosts[0] : undefined;
-        const firstGasCost = allGasCosts.length > 0 ? allGasCosts[0] : undefined;
-        const expressFeeCost = allFeeCosts.find((f) => f.name === "Boost fee");
-        const integratorFeeCost = allFeeCosts.length > 0 && collectFees
-            ? allFeeCosts.find((f) => f.name === "Integrator Fee")
-            : undefined;
-        const expectedGasRefundCost = BigNumber.from(firstFeeCost?.amount ?? "0")
-            .mul(fromChain?.chainType === ChainType.COSMOS ? 0 : gasRefundMultiplier)
-            .div(100);
-        const expectedGasRefundCostUSD = convertTokenAmountToUSD(formatUnits(expectedGasRefundCost, firstFeeCost?.token.decimals ?? "0"), firstFeeCost?.token.usdPrice ?? "0");
-        const sameTokenBetweenFees = firstFeeCost?.token.address === firstGasCost?.token.address &&
-            firstFeeCost?.token.chainId === firstGasCost?.token.chainId;
-        const isFromTokenNative = fromToken?.symbol === fromChain?.nativeCurrency.symbol;
-        const totalNativeFees = BigNumber.from(expressFeeCost?.amount ?? constants.Zero).add(sameTokenBetweenFees
-            ? BigNumber.from(firstFeeCost?.amount ?? constants.Zero).add(BigNumber.from(firstGasCost?.amount ?? constants.Zero))
-            : BigNumber.from(firstGasCost?.amount ?? constants.Zero));
-        const totalFeesInNativeTokenPlusRatio = totalNativeFees.mul(105).div(100);
-        const fromBalanceEnoughToSwap = isFromTokenNative
-            ? BigNumber.from(fromAmount ?? constants.Zero)
-                .add(totalFeesInNativeTokenPlusRatio)
-                .lte(nativeTokenBalanceFromChain.data ?? constants.Zero)
-            : totalFeesInNativeTokenPlusRatio.lte(nativeTokenBalanceFromChain.data ?? constants.Zero);
-        const minAmountValueWarnMsg = isFromTokenNative
-            ? (() => {
-                const fromBalance = nativeTokenBalanceFromChain.data ?? constants.Zero;
-                const minAmount = fromBalance.sub(totalFeesInNativeTokenPlusRatio);
-                return minAmount.gt(constants.Zero)
-                    ? formatUnits(minAmount, sourceChainNativeToken?.decimals ?? 18)
-                    : "0";
-            })()
-            : undefined;
-        const isSingleChainRoute = fromChain?.chainId === toChain?.chainId;
-        const estimatedRouteDuration = (() => {
-            const fallbackDuration = 20;
-            let durationInSeconds = fallbackDuration;
-            if (squidRoute?.estimate?.estimatedRouteDuration) {
-                durationInSeconds = squidRoute.estimate.estimatedRouteDuration;
-            }
-            else if (isSingleChainRoute) {
-                durationInSeconds = 1;
-            }
-            else {
-                durationInSeconds = expressActivatedUI
-                    ? fromChain?.estimatedBoostRouteDuration ?? fallbackDuration
-                    : fromChain?.estimatedRouteDuration ?? fallbackDuration;
-            }
-            return {
-                seconds: durationInSeconds,
-                format: (sTemplate = "s", mTemplate = "m", hTemplate = "h") => formatSeconds(durationInSeconds, sTemplate, mTemplate, hTemplate),
-            };
-        })();
-        return {
-            fromToken,
-            fromAmount,
-            fromAmountFormatted,
-            sourceChainNativeToken,
-            destChainNativeToken,
-            toAmountUSD,
-            toAmountUSDFloat,
-            exchangeRate,
-            toAmountMinUSD,
-            toAmountMin,
-            toAmount,
-            allFeeCosts,
-            allGasCosts,
-            firstFeeCost,
-            firstGasCost,
-            expressFeeCost,
-            integratorFeeCost,
-            expectedGasRefundCost,
-            expectedGasRefundCostUSD,
-            sameTokenBetweenFees,
-            isFromTokenNative,
-            totalNativeFees,
-            totalFeesInNativeTokenPlusRatio,
-            fromBalanceEnoughToSwap,
-            minAmountValueWarnMsg,
-            estimatedRouteDuration,
-        };
-    }, [
+    const estimateResults = useMemo(() => calculateEstimateResults({
+        squidRoute,
+        tokens,
+        fromChain,
+        toChain,
+        collectFees: !!collectFees && collectFees.fee > 0,
+        nativeTokenBalanceFromChainWei: nativeBalanceWei ?? BigInt("0"),
+        expressActivatedUI,
+    }), [
         squidRoute,
         tokens,
         fromChain,
         toChain,
         collectFees,
-        nativeTokenBalanceFromChain,
+        nativeBalanceWei,
         expressActivatedUI,
     ]);
     const balanceFormatted = useMultiChainBalance({
@@ -135,39 +38,13 @@ export const useEstimate = (squidRoute) => {
         enabled: !!squidRoute,
     }).balance ?? "0";
     const { getUSDValue } = useSingleTokenPrice(estimateResults.firstFeeCost?.token);
-    const totalWithRefundEstimate = useMemo(() => {
-        const { firstFeeCost, expressFeeCost, expectedGasRefundCost } = estimateResults;
-        const firstFee = {
-            BN: BigNumber.from(firstFeeCost?.amount ?? "0"),
-            token: firstFeeCost?.token,
-        };
-        const expressFee = {
-            BN: BigNumber.from(expressFeeCost?.amount ?? "0"),
-            token: expressFeeCost?.token,
-        };
-        const totalBnbAmount = firstFee.BN.add(expressFee.BN).sub(expectedGasRefundCost);
-        const totalAmount = formatUnits(totalBnbAmount, firstFee.token?.decimals ?? 18);
-        const formattedRefundCost = formatUnits(expectedGasRefundCost, firstFeeCost?.token.decimals);
-        const formattedRefundCostUSD = getUSDValue(formattedRefundCost);
-        const totalAmountUSD = +(firstFeeCost?.amountUsd ?? 0) +
-            +(expressFeeCost?.amountUsd ?? 0) -
-            +(formattedRefundCostUSD ?? 0);
-        return { totalAmount, totalAmountUSD, feeToken: firstFeeCost?.token };
-    }, [estimateResults, getUSDValue]);
-    const proposedGasDestinationAmount = useMemo(() => {
-        const nativeToken = estimateResults.destChainNativeToken?.symbol;
-        const gasAmounts = {
-            GLMR: 5.289,
-            ETH: 0.0009,
-            AVAX: 0.115,
-            BNB: 0.00425,
-            FTM: 4.45,
-            CELO: 3.052,
-            KAVA: 2.339,
-            MATIC: 1.795,
-        };
-        return { value: gasAmounts[nativeToken ?? ""] ?? 0, currency: nativeToken };
-    }, [estimateResults.destChainNativeToken]);
+    const totalWithRefundEstimate = useMemo(() => calculateTotalWithRefundEstimate(estimateResults.firstFeeCost, estimateResults.expressFeeCost, estimateResults.expectedGasRefundCost, getUSDValue), [
+        estimateResults.firstFeeCost,
+        estimateResults.expressFeeCost,
+        estimateResults.expectedGasRefundCost,
+        getUSDValue,
+    ]);
+    const proposedGasDestinationAmount = useMemo(() => getProposedGasDestinationAmount(estimateResults.destChainNativeToken?.symbol), [estimateResults.destChainNativeToken]);
     const swapAmountExceedsLimit = advanced?.disableTradeLimit
         ? false
         : estimateResults.toAmountUSDFloat > limitTradeSizeUsd;

package/dist/hooks/transaction/useEstimate.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEstimate.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useEstimate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useEstimate.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useEstimate.ts"],"names":[],"mappings":"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"}

package/dist/hooks/transaction/useExecuteTransaction.d.ts

@@ -1,5 +1,5 @@
 import type { RouteResponse } from "@0xsquid/squid-types";
-import type { TransactionReceipt } from "@ethersproject/abstract-provider";
+import { TransactionReceipt } from "ethers";
 import type { TransactionParams } from "../../core/types/transaction";
 declare enum ExecutionState {
     NOT_ENOUGH_BALANCE = "NOT_ENOUGH_BALANCE",
@@ -7,7 +7,7 @@ declare enum ExecutionState {
     READY = "READY"
 }
 export declare const useExecuteTransaction: (squidRoute?: RouteResponse["route"]) => {
-    swapQuery: import("@tanstack/react-query").UseMutationResult<boolean | TransactionReceipt, any, void, unknown>;
+    swapQuery: import("@tanstack/react-query").UseMutationResult<boolean | TransactionReceipt | null, any, void, unknown>;
     currentTransaction: TransactionParams | undefined;
     fromToken: import("@0xsquid/squid-types").Token | undefined;
     toToken: import("@0xsquid/squid-types").Token | undefined;