@0xsquid/react-hooks 8.0.7 → 8.1.1

package/dist/hooks/squid/useSquid.d.ts

@@ -6,8 +6,8 @@
 export declare const useSquid: () => {
     tokens: import("../..").Token[] | undefined;
     chains: import("../..").Chain[] | undefined;
-    forceSquidInfoRefetch: <TPageData>(options?: (import("@tanstack/react-query").RefetchOptions & import("@tanstack/react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("@tanstack/react-query").QueryObserverResult<import("../store/useSquidStore").Squid | null, unknown>>;
-    squidInfoQuery: import("@tanstack/react-query").UseQueryResult<import("../store/useSquidStore").Squid | null, unknown>;
+    forceSquidInfoRefetch: <TPageData>(options?: (import("@tanstack/react-query").RefetchOptions & import("@tanstack/react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("@tanstack/react-query").QueryObserverResult<import("../store/useSquidStore").Squid | null, Error>>;
+    squidInfoQuery: import("@tanstack/react-query").UseQueryResult<import("../store/useSquidStore").Squid | null, Error>;
     maintenanceMode: {
         active: boolean;
         message?: string | undefined;

package/dist/{index-DuicRCzG.js → index-CumomA_e.js}

@@ -4448,6 +4448,23 @@ const getAllKeysForSupportedCosmosChains = async (chainIds, keplrTypeWallet) =>
     if (!keplrTypeWallet)
         return [];
     const addresses = [];
+    if (typeof keplrTypeWallet.getChainInfosWithoutEndpoints === "function") {
+        try {
+            const keys = await getKeysSettled(chainIds, keplrTypeWallet);
+            keys.forEach((key, index) => {
+                if (key.status === "fulfilled" && key.value) {
+                    addresses.push({
+                        address: key.value,
+                        chainId: chainIds[index],
+                    });
+                }
+            });
+            return addresses;
+        }
+        catch (error) {
+            console.debug("Batch key fetch failed, trying sequential", error);
+        }
+    }
     for (const chainId of chainIds) {
         try {
             const keys = await getKeysSettled([chainId], keplrTypeWallet);
@@ -23084,7 +23101,7 @@ const filterViewableTokens = (tokens, config, direction) => {
 };
 const getSecretNetworkBalances = async (chainData, cosmosAddress, squidTokens, keplrTypeWallet) => {
     const squidSecretTokens = squidTokens.filter((t) => t.chainId === CHAIN_IDS.SECRET);
-    const { fetchAllSecretBalances } = await Promise.resolve().then(function () { return require('./secretService-C_RrU7VT.js'); });
+    const { fetchAllSecretBalances } = await Promise.resolve().then(function () { return require('./secretService-xh6N3W9l.js'); });
     return fetchAllSecretBalances(chainData, cosmosAddress, squidSecretTokens, keplrTypeWallet);
 };
 function getTokenAssetsKey(token) {
@@ -23158,7 +23175,7 @@ function convertEvmosToEvmChain(cosmosChain) {
         // @ts-expect-error - isEvmos is not a property on EvmChain
         // We still need this attribute in evmos chains
         // even after they are converted to evm chains, to perform certain checks
-        // e.g checking ics20 allowance instead of erc20 allowance
+        // e.g skipping erc20 approve/allowance checks
         isEvmos: true,
         chainType: squidTypes.ChainType.EVM,
         axelarChainName: cosmosChain.axelarChainName,
@@ -24863,13 +24880,21 @@ const useSquid = () => {
      * Fetch squid info
      * Will refetch every minute
      */
-    const squidInfoQuery = reactQuery.useQuery(keys().squidInfo(), async () => {
-        if (squid) {
-            await squid?.init();
-            initializeSquidWithAssetsColors(squid, assetsColors);
-            return squid;
-        }
-        return null;
+    const squidInfoQuery = reactQuery.useQuery({
+        queryKey: keys().squidInfo(),
+        queryFn: async () => {
+            if (squid) {
+                await squid?.init();
+                initializeSquidWithAssetsColors(squid, assetsColors);
+                return squid;
+            }
+            return null;
+        },
+        enabled: !!squid && !maintenanceMode.active,
+        retry: false,
+        onError: (error) => {
+            console.error("Failed to fetch squid info:", error);
+        },
     });
     const tokens = React.useMemo(() => {
         if ((squidInfoQuery?.data?.tokens ?? []).length > 0) {
@@ -26260,7 +26285,7 @@ function useStellarWallets() {
                 return;
             try {
                 const { allowAllModules: initializeAllModules } = await import('@creit.tech/stellar-wallets-kit');
-                const { formatStellarWallet } = await Promise.resolve().then(function () { return require('./stellarService.client-CuyF4Qwx.js'); });
+                const { formatStellarWallet } = await Promise.resolve().then(function () { return require('./stellarService.client-Clze3MKI.js'); });
                 const modules = initializeAllModules();
                 const promises = modules.map(async (module) => {
                     const isAvailable = await module.isAvailable();
@@ -27438,6 +27463,8 @@ const useCosmos = () => {
         if (cosmosWalletObject) {
             setCosmosChainId(chainInfos.chainId.toString());
             try {
+                // Check if this wallet supports batch enabling chains
+                // If it does, we can use it to enable all the cosmos chains at once
                 if (approveAllChains &&
                     typeof cosmosWalletObject.getChainInfosWithoutEndpoints ===
                         "function") {
@@ -27450,6 +27477,11 @@ const useCosmos = () => {
                         await cosmosWalletObject.enable(chainsToEnable);
                     }
                     catch (error) {
+                        // If the user rejected the batch enable request, throw an error to avoid
+                        // Fallback to a loop trying to enable each chain one by one
+                        if (isUserRejectionError(normalizeError(error))) {
+                            throw error;
+                        }
                         console.warn("Failed to get chain infos, falling back to single chain enable", error);
                         await cosmosWalletObject.enable(chainInfos.chainId);
                     }
@@ -31396,135 +31428,6 @@ const useAllTransactionsStatus = ({ enabled }) => {
     };
 };
 
-var ics20Abi = [
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "grantee",
-				type: "address"
-			},
-			{
-				internalType: "address",
-				name: "granter",
-				type: "address"
-			}
-		],
-		name: "allowance",
-		outputs: [
-			{
-				components: [
-					{
-						internalType: "string",
-						name: "sourcePort",
-						type: "string"
-					},
-					{
-						internalType: "string",
-						name: "sourceChannel",
-						type: "string"
-					},
-					{
-						components: [
-							{
-								internalType: "string",
-								name: "denom",
-								type: "string"
-							},
-							{
-								internalType: "uint256",
-								name: "amount",
-								type: "uint256"
-							}
-						],
-						internalType: "struct Coin[]",
-						name: "spendLimit",
-						type: "tuple[]"
-					},
-					{
-						internalType: "string[]",
-						name: "allowList",
-						type: "string[]"
-					},
-					{
-						internalType: "string[]",
-						name: "allowedPacketData",
-						type: "string[]"
-					}
-				],
-				internalType: "struct ICS20Allocation[]",
-				name: "allocations",
-				type: "tuple[]"
-			}
-		],
-		stateMutability: "view",
-		type: "function"
-	},
-	{
-		inputs: [
-			{
-				internalType: "address",
-				name: "grantee",
-				type: "address"
-			},
-			{
-				components: [
-					{
-						internalType: "string",
-						name: "sourcePort",
-						type: "string"
-					},
-					{
-						internalType: "string",
-						name: "sourceChannel",
-						type: "string"
-					},
-					{
-						components: [
-							{
-								internalType: "string",
-								name: "denom",
-								type: "string"
-							},
-							{
-								internalType: "uint256",
-								name: "amount",
-								type: "uint256"
-							}
-						],
-						internalType: "struct Coin[]",
-						name: "spendLimit",
-						type: "tuple[]"
-					},
-					{
-						internalType: "string[]",
-						name: "allowList",
-						type: "string[]"
-					},
-					{
-						internalType: "string[]",
-						name: "allowedPacketData",
-						type: "string[]"
-					}
-				],
-				internalType: "struct ICS20Allocation[]",
-				name: "allocations",
-				type: "tuple[]"
-			}
-		],
-		name: "approve",
-		outputs: [
-			{
-				internalType: "bool",
-				name: "approved",
-				type: "bool"
-			}
-		],
-		stateMutability: "nonpayable",
-		type: "function"
-	}
-];
-
 const useErc20Allowance = ({ tokenAddress, ownerAddress, spenderAddress, amount = BigInt(0), chainId, transactionType, enabled = true, }) => {
     const parsedTokenAddress = parseEvmAddress(tokenAddress);
     const parsedOwnerAddress = parseEvmAddress(ownerAddress);
@@ -31564,49 +31467,6 @@ const useErc20Allowance = ({ tokenAddress, ownerAddress, spenderAddress, amount
     };
 };
 
-/**
- * ICS20 is similar to ERC20 but the ABI is different
- * https://docs.evmos.org/develop/smart-contracts/evm-extensions/ibc-transfer
- * https://github.com/evmos/extensions/blob/main/precompiles/abi/ics20.json
- */
-function useIcs20Allowance({ targetAddress, ownerAddress, amount = BigInt(0), chainId, enabled = true, }) {
-    const parsedTargetAddress = parseEvmAddress(targetAddress);
-    const parsedOwnerAddress = parseEvmAddress(ownerAddress);
-    const query = wagmi.useReadContract({
-        abi: ics20Abi,
-        address: parsedTargetAddress,
-        functionName: "allowance",
-        chainId,
-        args: parsedOwnerAddress && parsedTargetAddress
-            ? [parsedOwnerAddress, parsedOwnerAddress] // ICS20: (grantee, granter)
-            : undefined,
-        query: {
-            enabled: enabled && Boolean(parsedTargetAddress && parsedOwnerAddress),
-        },
-    });
-    if (!parsedTargetAddress || !parsedOwnerAddress) {
-        return {
-            hasAllowance: false,
-            error: new Error("Invalid or missing address"),
-        };
-    }
-    // Handle ICS20 format
-    let allowanceInWei;
-    if (query.data) {
-        const ics20Data = query.data;
-        allowanceInWei = ics20Data?.[0]?.spendLimit?.[0]?.amount ?? BigInt(0);
-    }
-    else {
-        allowanceInWei = BigInt(0);
-    }
-    const hasAllowance = allowanceInWei >= amount;
-    return {
-        query,
-        hasAllowance,
-        allowanceInWei,
-    };
-}
-
 const useApproval = ({ squidRoute, }) => {
     const { data: walletClient } = wagmi.useWalletClient();
     const publicClient = wagmi.usePublicClient();
@@ -31618,12 +31478,15 @@ const useApproval = ({ squidRoute, }) => {
     const { getChainType } = useSquidChains();
     const { switchChainAsync } = wagmi.useSwitchChain();
     const { connectedAddress: { address: sourceUserAddress }, } = useMultiChainWallet(fromChain);
-    const isSrcChainEvmos = isEvmosChain(fromChain);
-    const isSagaSameChainSwap = isSameChain &&
+    const isSagaEvmSameChainSwap = isSameChain &&
         fromChain?.chainId.toString() === CHAIN_IDS.SAGA_EVM.toString();
-    // Use ICS20 for Evmos chains, except for SagaEVM same-chain swaps
-    const useIcs20 = isSrcChainEvmos && !isSagaSameChainSwap;
-    const { hasAllowance: hasErc20Allowance, query: erc20AllowanceQuery, allowanceInWei: erc20AllowanceInWei, } = useErc20Allowance({
+    // Swaps on SagaEVM are regular EVM transactions, following the standard ERC20 approve/allowance mechanism.
+    // However, when bridging from SagaEVM to other Saga chainlets, approve/allowance is not needed
+    // as these transfers interact with the SagaEVM ICS20 precompile contract.
+    // See https://github.com/sagaxyz/cosmos-evm/tree/main/precompiles/ics20
+    const erc20AllowanceQueryEnabled = isSagaEvmSameChainSwap ||
+        (fromChain?.chainType === squidTypes.ChainType.EVM && !isEvmosChain(fromChain));
+    const { hasAllowance, query: allowanceQuery, allowanceInWei, } = useErc20Allowance({
         tokenAddress: fromToken?.address,
         ownerAddress: sourceUserAddress,
         spenderAddress: squidRoute?.transactionRequest
@@ -31631,19 +31494,8 @@ const useApproval = ({ squidRoute, }) => {
         amount: BigInt(squidRoute?.params.fromAmount ?? "0"),
         chainId: Number(fromChain?.chainId),
         transactionType: squidRoute?.transactionRequest?.type,
-        enabled: !useIcs20,
-    });
-    const { hasAllowance: hasIcs20Allowance, query: ics20AllowanceQuery, allowanceInWei: ics20AllowanceInWei, } = useIcs20Allowance({
-        ownerAddress: sourceUserAddress,
-        targetAddress: squidRoute?.transactionRequest
-            ?.target,
-        amount: BigInt(squidRoute?.params.fromAmount ?? "0"),
-        chainId: Number(fromChain?.chainId),
-        enabled: useIcs20,
+        enabled: erc20AllowanceQueryEnabled,
     });
-    const hasAllowance = useIcs20 ? hasIcs20Allowance : hasErc20Allowance;
-    const allowanceInWei = useIcs20 ? ics20AllowanceInWei : erc20AllowanceInWei;
-    const allowanceQuery = useIcs20 ? ics20AllowanceQuery : erc20AllowanceQuery;
     /**
      * Checking if spending tokens is allowed for this source address
      * On Success: storing the transaction
@@ -31651,16 +31503,16 @@ const useApproval = ({ squidRoute, }) => {
      * @returns {boolean} approved
      */
     const routeApproved = reactQuery.useQuery(keys().routeApproved(squidRoute, allowanceInWei), async () => {
-        // Approval is only needed for EVM chains
-        if (getChainType(squidRoute?.params.fromChain) === squidTypes.ChainType.EVM) {
+        if (erc20AllowanceQueryEnabled) {
             return hasAllowance;
         }
         return true;
     }, {
         enabled: !!squidRoute &&
             !!sourceUserAddress &&
-            !allowanceQuery?.isLoading &&
-            allowanceQuery?.isFetched,
+            // Only wait for allowance if that query is actually enabled
+            (!erc20AllowanceQueryEnabled ||
+                (!allowanceQuery?.isLoading && allowanceQuery?.isFetched)),
     });
     // USDT has a very specific way of handling approvals
     // ```
@@ -31750,7 +31602,8 @@ const useApproval = ({ squidRoute, }) => {
      */
     const approveRoute = reactQuery.useMutation(async () => {
         try {
-            if (fromToken?.address === nativeEvmTokenAddress) {
+            if (fromToken?.address.toLowerCase() ===
+                nativeEvmTokenAddress.toLowerCase()) {
                 return true;
             }
             if (!!squidRoute && walletClient && fromToken && evmSigner && squid) {
@@ -31763,49 +31616,14 @@ const useApproval = ({ squidRoute, }) => {
                 catch (error) {
                     console.error("Error switching network:", error);
                 }
-                let approveTx;
-                if (useIcs20) {
-                    const channel = squidRoute.estimate.actions[0].data
-                        .ibcChannel;
-                    const ics20Interface = new ethers.ethers.Interface(ics20Abi);
-                    const approveData = ics20Interface.encodeFunctionData("approve", [
-                        squidRoute.params.fromAddress,
-                        [
-                            {
-                                sourcePort: "transfer",
-                                sourceChannel: channel,
-                                spendLimit: [
-                                    {
-                                        denom: squidRoute.estimate.actions[0].fromToken
-                                            .originalAddress,
-                                        amount: squidRoute.params.fromAmount,
-                                    },
-                                ],
-                                allowList: [],
-                                allowedPacketData: ["*"],
-                            },
-                        ],
-                    ]);
-                    approveTx = await evmSigner.sendTransaction({
-                        to: squidRoute.transactionRequest.target,
-                        data: approveData,
-                        value: "0",
-                        gasLimit: squidRoute.transactionRequest
-                            .gasLimit,
-                        gasPrice: squidRoute.transactionRequest
-                            .gasPrice,
-                    });
-                }
-                else {
-                    approveTx = await squid.approveRoute({
-                        route: squidRoute,
-                        signer: evmSigner,
-                        // For security reasons, we don't want to allow infinite approvals in our frontends
-                        executionSettings: {
-                            infiniteApproval: false,
-                        },
-                    });
-                }
+                const approveTx = await squid.approveRoute({
+                    route: squidRoute,
+                    signer: evmSigner,
+                    // For security reasons, we don't want to allow infinite approvals in our frontends
+                    executionSettings: {
+                        infiniteApproval: false,
+                    },
+                });
                 if (isProblematicConnector(activeConnector)) {
                     await sleep(3_000);
                 }
@@ -36380,9 +36198,14 @@ const SquidProvider = ({ children, config, placeholder, }) => {
         catch (error) {
             const isAxios503Error = error.isAxiosError &&
                 error.response?.status === 503;
-            if (isAxios503Error) {
-                const maintenanceMessage = error.response?.data
-                    ?.message ?? undefined;
+            const isBackendDown = isAxios503Error ||
+                error.isAxiosError ||
+                error instanceof Error;
+            if (isBackendDown) {
+                const maintenanceMessage = isAxios503Error
+                    ? error.response?.data
+                        ?.message ?? undefined
+                    : "Unable to connect to Squid. Please check your connection or try again later.";
                 // Even with an error, we want wagmi to be defined so that we can display the maintenance mode layout
                 // Create wagmi config with mainnet as fallback in maintenance mode
                 const newWagmiConfig = wagmi.createConfig({
@@ -36652,4 +36475,4 @@ exports.useXrplTrustLine = useXrplTrustLine;
 exports.waitForReceiptWithRetry = waitForReceiptWithRetry;
 exports.walletIconBaseUrl = walletIconBaseUrl;
 exports.walletSupportsChainType = walletSupportsChainType;
-//# sourceMappingURL=index-DuicRCzG.js.map
+//# sourceMappingURL=index-CumomA_e.js.map