@0xsquid/react-hooks 5.0.4-beta.0 → 5.0.4-beta.1

package/dist/hooks/transaction/useEstimate.js

@@ -1,6 +1,8 @@
+import { FeeType } from "@0xsquid/squid-types";
 import { useMemo } from "react";
 import { limitTradeSizeUsd } from "../../core/constants";
 import { useSquidTokens } from "../../hooks/tokens/useSquidTokens";
+import { formatUsdAmount } from "../../services";
 import { calculateEstimateResults, calculateTotalWithRefundEstimate, getProposedGasDestinationAmount, } from "../../services/internal/estimateService";
 import { useConfigStore } from "../store/useSquidStore";
 import { useSwap } from "../swap/useSwap";
@@ -8,6 +10,8 @@ import { useMultiChainBalance } from "../tokens/useMultiChainBalance";
 import { useNativeBalance } from "../tokens/useNativeBalance";
 import { useSingleTokenPrice } from "../tokens/useSingleTokenPrice";
 import { useEstimateExpress } from "./useExpress";
+const DEFAULT_PROVIDER_IMAGE_URL = "https://raw.githubusercontent.com/0xsquid/assets/main/images/webp128/providers/squid.webp";
+const AXELAR_PROVIDER_IMAGE_URL = "https://raw.githubusercontent.com/0xsquid/assets/main/images/webp128/providers/axelar.webp";
 export const useEstimate = (squidRoute) => {
     const collectFees = useConfigStore((state) => state.config.collectFees);
     const { tokens } = useSquidTokens();
@@ -44,16 +48,81 @@ export const useEstimate = (squidRoute) => {
         getUSDValue,
     ]);
     const proposedGasDestinationAmount = useMemo(() => getProposedGasDestinationAmount(estimateResults.destChainNativeToken?.symbol), [estimateResults.destChainNativeToken]);
+    const { feeCostsFormatted, totalFeeCostsUsd } = useMemo(() => {
+        const feeCosts = squidRoute?.estimate.feeCosts ?? [];
+        const feeCostsRenamed = [];
+        const feesToRename = [
+            {
+                newName: "CORAL fee",
+                match: [FeeType.EXECUTION_FEE, FeeType.SETTLEMENT_FEE],
+                imageUrl: DEFAULT_PROVIDER_IMAGE_URL,
+            },
+            {
+                newName: "Axelar fee",
+                match: [FeeType.GAS_RECEIVER_FEE, FeeType.BOOST_FEE],
+                imageUrl: AXELAR_PROVIDER_IMAGE_URL,
+            },
+        ];
+        for (const fee of feeCosts) {
+            if (Number(fee.amountUsd) === 0)
+                continue;
+            const feeToRename = feesToRename.find(({ match }) => match.includes(fee.name));
+            if (feeToRename) {
+                const previousRenamedFeeIndex = feeCostsRenamed.findIndex((f) => f.name === feeToRename.newName);
+                if (feeCostsRenamed[previousRenamedFeeIndex] == null) {
+                    feeCostsRenamed.push({
+                        name: feeToRename.newName,
+                        amountUsd: Number(fee.amountUsd),
+                        imageUrl: feeToRename.imageUrl,
+                    });
+                }
+                else {
+                    feeCostsRenamed[previousRenamedFeeIndex].amountUsd += Number(fee.amountUsd);
+                }
+            }
+            else {
+                feeCostsRenamed.push({
+                    name: fee.name,
+                    amountUsd: Number(fee.amountUsd),
+                    imageUrl: DEFAULT_PROVIDER_IMAGE_URL,
+                });
+            }
+        }
+        const feeCostsFormatted = feeCostsRenamed.map((fee) => ({
+            name: fee.name,
+            imageUrl: fee.imageUrl,
+            amountUsdFormatted: formatUsdAmount(fee.amountUsd, {
+                decimalPrecision: true,
+            }),
+        }));
+        const totalFeeCostsUsd = feeCosts.reduce((totalFees, currentFee) => {
+            return Number(totalFees) + Number(currentFee.amountUsd);
+        }, 0);
+        const totalFeeCostsUsdFormatted = formatUsdAmount(totalFeeCostsUsd, {
+            decimalPrecision: true,
+        });
+        return {
+            feeCostsFormatted,
+            totalFeeCostsUsd: totalFeeCostsUsdFormatted,
+        };
+    }, [squidRoute?.estimate.feeCosts]);
+    const slippageFormatted = 
+    // TODO: update types
+    Number(squidRoute?.estimate?.aggregateSlippage ?? 0).toFixed(2) +
+        "%";
     const swapAmountExceedsLimit = estimateResults.toAmountUSDFloat > limitTradeSizeUsd;
     const enoughBalanceToSwap = +balanceFormatted >= 0 &&
         +balanceFormatted > +estimateResults.fromAmountFormatted;
     return {
         ...estimateResults,
         balanceFormatted,
+        slippageFormatted,
         totalWithRefundEstimate,
         proposedGasDestinationAmount,
         swapAmountExceedsLimit,
         enoughBalanceToSwap,
+        feeCostsFormatted,
+        totalFeeCostsUsd,
     };
 };
 //# sourceMappingURL=useEstimate.js.map

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,20 +1,13 @@
 import type { RouteResponse } from "@0xsquid/squid-types";
 import { TransactionReceipt } from "ethers";
 import type { TransactionParams } from "../../core/types/transaction";
-declare enum ExecutionState {
-    NOT_ENOUGH_BALANCE = "NOT_ENOUGH_BALANCE",
-    NOT_CONNECTED = "NOT_CONNECTED",
-    READY = "READY"
-}
 export declare const useExecuteTransaction: (squidRoute?: RouteResponse["route"]) => {
-    swapQuery: import("@tanstack/react-query").UseMutationResult<boolean | TransactionReceipt | null, any, void, unknown>;
+    swapQuery: import("@tanstack/react-query").UseMutationResult<string | boolean | void | TransactionReceipt | null, any, void, unknown>;
     currentTransaction: TransactionParams | undefined;
     fromToken: import("@0xsquid/squid-types").Token | undefined;
     toToken: import("@0xsquid/squid-types").Token | undefined;
     fromPrice: string | undefined;
     toChain: import("@0xsquid/squid-types").ChainData | undefined;
     fromChain: import("@0xsquid/squid-types").ChainData | undefined;
-    executionState: ExecutionState;
     signerReady: boolean;
 };
-export {};

package/dist/hooks/transaction/useExecuteTransaction.js

@@ -10,35 +10,28 @@ import { TransactionErrorType } from "../../core/types/error";
 import { TransactionStatus } from "../../core/types/transaction";
 import { getWorkingCosmosRpcUrl } from "../../services/external/rpcService";
 import { getTransactionError } from "../../services/internal/errorService";
-import { getSourceExplorerTxUrl } from "../../services/internal/transactionService";
+import { getSourceExplorerTxUrl, isDepositRoute, sleep, } from "../../services/internal/transactionService";
 import { InjectiveSigningStargateClient } from "@injectivelabs/sdk-ts/dist/cjs/core/stargate";
 import { CHAIN_IDS } from "../../core/constants";
 import { useSquidChains } from "../../hooks//chains/useSquidChains";
 import { useSquidStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
 import { useSwap } from "../../hooks/swap/useSwap";
-import { useEstimate } from "../../hooks/transaction/useEstimate";
 import { useGnosisContext } from "../../hooks/wallet/useGnosisContext";
 import { useMultiChainWallet } from "../../hooks/wallet/useMultiChainWallet";
-import { getCosmosSigningClient } from "../../services";
+import { executeSolanaSwap, executeSolanaTransfer, getCosmosSigningClient, } from "../../services";
 import { WidgetEvents } from "../../services/internal/eventService";
+import { useSolana } from "../solana/useSolana";
+import { useDepositAddressStore } from "../store/useDepositAddressStore";
 import { useHistory } from "../user/useHistory";
 import { useSigner } from "../wallet/useSigner";
-var ExecutionState;
-(function (ExecutionState) {
-    ExecutionState["NOT_ENOUGH_BALANCE"] = "NOT_ENOUGH_BALANCE";
-    ExecutionState["NOT_CONNECTED"] = "NOT_CONNECTED";
-    ExecutionState["READY"] = "READY";
-})(ExecutionState || (ExecutionState = {}));
 export const useExecuteTransaction = (squidRoute) => {
-    const { evmSigner, isEvmSignerReady, cosmosSigner, 
-    // solanaSigner,
-    bitcoinSigner, isSolanaSignerReady, } = useSigner();
-    const { chains } = useSquidChains();
+    const { evmSigner, isEvmSignerReady, cosmosSigner, solanaSigner, bitcoinSigner, isSolanaSignerReady, } = useSigner();
+    const { connection } = useSolana();
+    const { findChain } = useSquidChains();
     const queryClient = useQueryClient();
     const squid = useSquidStore((state) => state.squid);
     const currentTransaction = useTransactionStore((state) => state.currentTransaction);
     const fromPrice = useTransactionStore((state) => state.fromPrice);
-    const { enoughBalanceToSwap } = useEstimate(squidRoute);
     const { connector: activeConnector } = useAccount();
     const { fromChain, toChain, fromToken, toToken, isSameChain } = useSwap();
     const { getGnosisTransactionHash } = useGnosisContext();
@@ -64,18 +57,6 @@ export const useExecuteTransaction = (squidRoute) => {
         bitcoinSigner,
         isSolanaSignerReady,
     ]);
-    /**
-     * States to see if the swap execution is possible or not based on swap & user params
-     * And if not possible, gives the reason
-     * TODO: The NOT_ENOUGH_BALANCE state could be fetch independently from the route response, only based on user fromAmount
-     */
-    const executionState = useMemo(() => {
-        if (!enoughBalanceToSwap) {
-            return ExecutionState.NOT_ENOUGH_BALANCE;
-        }
-        // TODO:; Add more states here
-        return ExecutionState.READY;
-    }, [enoughBalanceToSwap]);
     /**
      * Set the transaction state in the store
      * This is useful to access the latest transaction from any hook
@@ -276,6 +257,19 @@ export const useExecuteTransaction = (squidRoute) => {
                 }
             }
             try {
+                // TODO: inconsistent connector ID behavior, investigate and debug Wagmi
+                const isProblematicConnector = activeConnector?.id != null &&
+                    ["rabby", "io.rabby"].includes(activeConnector.id);
+                const isProblematicSourceChain = [
+                    CHAIN_IDS.BSC.mainnet,
+                    CHAIN_IDS.BASE.mainnet,
+                ].includes(route.params.fromChain);
+                // Issues with Rabby wallet on some chains
+                // we need to wait some time before getting the transaction receipt
+                // https://github.com/ethers-io/ethers.js/issues/4760
+                if (isProblematicConnector && isProblematicSourceChain) {
+                    await sleep(3_000);
+                }
                 const response = await txResponse.wait();
                 return response;
             }
@@ -293,189 +287,168 @@ export const useExecuteTransaction = (squidRoute) => {
         throw new Error("Need all parameters");
     });
     // TODO: Find a better way to parse (route.transactionRequest as OnChainExecutionData)
-    // const swapQuerySolana = useMutation(
-    //   async (route?: RouteResponse["route"]) => {
-    //     try {
-    //       if (!route) {
-    //         throw new Error("Route is required");
-    //       }
-    //       if (!solanaSigner) {
-    //         throw new Error("Solana signer is required");
-    //       }
-    //       if (!route.params.fromAddress || !route.params.toAddress) {
-    //         throw new Error("From or to address is required");
-    //       }
-    //       const isDirectTransfer = isSolanaDirectTransfer({
-    //         fromChain,
-    //         route,
-    //       });
-    //       if (isDirectTransfer) {
-    //         const signature = await executeSolanaTransfer({
-    //           amount: BigInt(route.params.fromAmount),
-    //           target: (route.transactionRequest as OnChainExecutionData)?.target,
-    //           solanaSigner,
-    //           connection,
-    //           onSigned: (signature) => {
-    //             const txParams = setTransactionState({
-    //               route,
-    //               txHash: signature,
-    //               transactionIdForStatus:
-    //                 (route.transactionRequest as OnChainExecutionData)
-    //                   ?.requestId ?? "",
-    //               userAddress: sourceUserAddress,
-    //               status: TransactionStatus.INITIAL_LOADING,
-    //               sourceStatus: TransactionStatus.ONGOING,
-    //             });
-    //             if (txParams) {
-    //               addTransaction({
-    //                 ...txParams,
-    //                 params: route.params,
-    //                 estimate: route.estimate,
-    //               });
-    //             }
-    //             WidgetEvents.getInstance().dispatchSwapExecuteCall(
-    //               route,
-    //               signature
-    //             );
-    //           },
-    //         });
-    //         return signature;
-    //       }
-    //       const signature = await executeSolanaSwap({
-    //         route: route!,
-    //         squid,
-    //         solanaSigner,
-    //         connection,
-    //         sourceUserAddress: route.params.fromAddress,
-    //       });
-    //       const txParams = setTransactionState({
-    //         route,
-    //         txHash: signature,
-    //         transactionIdForStatus:
-    //           (route.transactionRequest as OnChainExecutionData)?.requestId ?? "",
-    //         userAddress: sourceUserAddress,
-    //         status: TransactionStatus.INITIAL_LOADING,
-    //         sourceStatus: TransactionStatus.ONGOING,
-    //       });
-    //       if (txParams) {
-    //         addTransaction({
-    //           ...txParams,
-    //           params: route.params,
-    //           estimate: route.estimate,
-    //         });
-    //       }
-    //       WidgetEvents.getInstance().dispatchSwapExecuteCall(route, signature);
-    //       return signature;
-    //     } catch (error) {
-    //       console.error("Solana transaction failed:", error);
-    //       throw error instanceof Error
-    //         ? error
-    //         : new Error("Failed to execute Solana transaction");
-    //     }
-    //   },
-    //   {
-    //     onError: (error) => {
-    //       const { currentTransaction: currentTx } =
-    //         useTransactionStore.getState();
-    //       const errorObject = getTransactionError(error);
-    //       useTransactionStore.setState({
-    //         currentTransaction: {
-    //           ...currentTx!,
-    //           status: TransactionStatus.ERROR,
-    //           sourceStatus: TransactionStatus.ERROR,
-    //           error: errorObject,
-    //         },
-    //       });
-    //       WidgetEvents.getInstance().dispatchSwapRouteExecutionError({
-    //         error: errorObject,
-    //       });
-    //       // TODO: Handle that for solana
-    //       if (
-    //         currentTx?.transactionId &&
-    //         errorObject?.type === TransactionErrorType.CALL_EXCEPTION
-    //       ) {
-    //         replaceTransactionStatus(
-    //           currentTx.transactionId,
-    //           currentTx.statusResponse,
-    //           TransactionStatus.ERROR
-    //         );
-    //       }
-    //     },
-    //     onSuccess: () => {
-    //       const { currentTransaction: currentTx } =
-    //         useTransactionStore.getState();
-    //       queryClient.invalidateQueries(getPrefixKey(QueryKeys.Balances));
-    //       if (isSameChain && currentTx?.transactionId) {
-    //         replaceTransactionStatus(
-    //           currentTx.transactionId,
-    //           currentTx.statusResponse,
-    //           TransactionStatus.SUCCESS
-    //         );
-    //       }
-    //       useTransactionStore.setState({
-    //         currentTransaction: {
-    //           ...currentTx!,
-    //           sourceStatus: TransactionStatus.SUCCESS,
-    //           status: isSameChain
-    //             ? TransactionStatus.SUCCESS
-    //             : TransactionStatus.ONGOING,
-    //         },
-    //       });
-    //     },
-    //   }
-    // );
+    const swapQuerySolana = useMutation(async (route) => {
+        try {
+            if (!route) {
+                throw new Error("Route is required");
+            }
+            if (!solanaSigner) {
+                throw new Error("Solana signer is required");
+            }
+            if (!route.params.fromAddress || !route.params.toAddress) {
+                throw new Error("From or to address is required");
+            }
+            const isDirectTransfer = isDepositRoute(route);
+            // Get the deposit address from the squidRoute
+            const depositData = useDepositAddressStore.getState().deposit;
+            // Validate params
+            if (!depositData?.depositAddress) {
+                throw new Error("Deposit address is required");
+            }
+            // Means it's a transfer to a deposit address
+            // Instead of a Swap/Contract call using a DEX like Jupiter
+            if (isDirectTransfer) {
+                const signature = await executeSolanaTransfer({
+                    amount: BigInt(route.params.fromAmount),
+                    target: depositData.depositAddress,
+                    solanaSigner,
+                    connection,
+                    onSigned: (txHash) => {
+                        WidgetEvents.getInstance().dispatchSwapExecuteCall(route, txHash);
+                        const txParams = setTransactionState({
+                            route,
+                            txHash,
+                            transactionIdForStatus: depositData.chainflipStatusTrackingId,
+                            userAddress: sourceUserAddress,
+                            status: TransactionStatus.INITIAL_LOADING,
+                            sourceStatus: TransactionStatus.ONGOING,
+                        });
+                        if (txParams) {
+                            addTransaction({
+                                ...txParams,
+                                params: route.params,
+                                estimate: route.estimate,
+                            });
+                        }
+                    },
+                });
+                return signature;
+            }
+            const signature = await executeSolanaSwap({
+                route: route,
+                squid,
+                solanaSigner,
+                connection,
+                sourceUserAddress: route.params.fromAddress,
+            });
+            const txParams = setTransactionState({
+                route,
+                txHash: signature,
+                transactionIdForStatus: undefined,
+                userAddress: sourceUserAddress,
+                status: TransactionStatus.INITIAL_LOADING,
+                sourceStatus: TransactionStatus.ONGOING,
+            });
+            if (txParams) {
+                addTransaction({
+                    ...txParams,
+                    params: route.params,
+                    estimate: route.estimate,
+                });
+            }
+            WidgetEvents.getInstance().dispatchSwapExecuteCall(route, signature);
+            return signature;
+        }
+        catch (error) {
+            console.error("Solana transaction failed:", error);
+            throw error instanceof Error
+                ? error
+                : new Error("Failed to execute Solana transaction");
+        }
+    }, {
+        onError: (error) => {
+            const { currentTransaction: currentTx } = useTransactionStore.getState();
+            const errorObject = getTransactionError(error);
+            useTransactionStore.setState({
+                currentTransaction: {
+                    ...currentTx,
+                    status: TransactionStatus.ERROR,
+                    sourceStatus: TransactionStatus.ERROR,
+                    error: errorObject,
+                },
+            });
+            WidgetEvents.getInstance().dispatchSwapRouteExecutionError({
+                error: errorObject,
+            });
+            // TODO: Handle that for solana
+            if (currentTx?.transactionId &&
+                errorObject?.type === TransactionErrorType.CALL_EXCEPTION) {
+                replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.ERROR);
+            }
+        },
+        onSuccess: () => {
+            const { currentTransaction: currentTx } = useTransactionStore.getState();
+            queryClient.invalidateQueries(getPrefixKey(QueryKeys.Balances));
+            if (isSameChain && currentTx?.transactionId) {
+                replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.SUCCESS);
+            }
+            useTransactionStore.setState({
+                currentTransaction: {
+                    ...currentTx,
+                    sourceStatus: TransactionStatus.SUCCESS,
+                    status: isSameChain
+                        ? TransactionStatus.SUCCESS
+                        : TransactionStatus.ONGOING,
+                },
+            });
+        },
+    });
     // // TODO: Find a better way to parse (route.transactionRequest as OnChainExecutionData)
-    // const swapQueryBitcoin = useMutation(
-    //   async (route?: RouteResponse["route"]) => {
-    //     const depositAddress = (route?.transactionRequest as OnChainExecutionData)
-    //       ?.target;
-    //     const sendAmount = (route?.transactionRequest as OnChainExecutionData)
-    //       ?.value;
-    //     const allParamsValid =
-    //       route && bitcoinSigner && depositAddress && sendAmount;
-    //     await changeNetworkIfNeeded.mutateAsync();
-    //     if (allParamsValid) {
-    //       WidgetEvents.getInstance().dispatchSwapTxSignatureRequested({
-    //         route,
-    //       });
-    //       const { txHash } = await bitcoinSigner.sendBTC(
-    //         depositAddress,
-    //         Number(sendAmount)
-    //       );
-    //       if (txHash) {
-    //         resetQueriesAfterTxSigned();
-    //       }
-    //       // Dispatch event so it can be listened from outside the widget
-    //       WidgetEvents.getInstance().dispatchSwapExecuteCall(route, txHash);
-    //       if (route.transactionRequest) {
-    //         const txParams: TransactionParams | undefined = setTransactionState({
-    //           route,
-    //           txHash,
-    //           // When bridging from Bitcoin we need to send the chainflipId to the status endpoint
-    //           // instead of the Bitcoin transaction hash
-    //           transactionIdForStatus:
-    //             (route.transactionRequest as OnChainExecutionData)?.requestId ??
-    //             "",
-    //           userAddress: sourceUserAddress,
-    //           status: TransactionStatus.INITIAL_LOADING,
-    //           sourceStatus: TransactionStatus.ONGOING,
-    //           axelarUrl: undefined,
-    //         });
-    //         if (txParams) {
-    //           addTransaction({
-    //             ...txParams,
-    //             params: route.params,
-    //             estimate: route.estimate,
-    //           });
-    //         }
-    //       }
-    //     } else {
-    //       throw new Error("Need all parameters");
-    //     }
-    //   }
-    // );
+    const swapQueryBitcoin = useMutation(async (route) => {
+        const depositAddress = route?.transactionRequest
+            ?.target;
+        const sendAmount = route?.transactionRequest
+            ?.value;
+        const allParamsValid = route && bitcoinSigner && depositAddress && sendAmount;
+        await changeNetworkIfNeeded.mutateAsync();
+        if (allParamsValid) {
+            WidgetEvents.getInstance().dispatchSwapTxSignatureRequested({
+                route,
+            });
+            const { txHash } = await bitcoinSigner.sendBTC(depositAddress, Number(sendAmount));
+            if (txHash) {
+                resetQueriesAfterTxSigned();
+            }
+            // Dispatch event so it can be listened from outside the widget
+            WidgetEvents.getInstance().dispatchSwapExecuteCall(route, txHash);
+            if (route.transactionRequest) {
+                const txParams = setTransactionState({
+                    route,
+                    txHash,
+                    // When bridging from Bitcoin we need to send the chainflipId to the status endpoint
+                    // instead of the Bitcoin transaction hash
+                    transactionIdForStatus: route.transactionRequest?.requestId ??
+                        "",
+                    userAddress: sourceUserAddress,
+                    status: TransactionStatus.INITIAL_LOADING,
+                    sourceStatus: TransactionStatus.ONGOING,
+                    axelarUrl: undefined,
+                });
+                if (txParams) {
+                    addTransaction({
+                        ...txParams,
+                        params: route.params,
+                        estimate: route.estimate,
+                    });
+                }
+            }
+        }
+        else {
+            throw new Error("Need all parameters");
+        }
+    });
     const swapQuery = useMutation(async () => {
-        const sourceChain = chains?.find((chain) => chain.chainId == squidRoute?.params?.fromChain);
+        const sourceChain = findChain(squidRoute?.params?.fromChain);
         switch (sourceChain?.chainType) {
             case ChainType.COSMOS: {
                 return swapQueryCosmos.mutateAsync(squidRoute);
@@ -483,12 +456,12 @@ export const useExecuteTransaction = (squidRoute) => {
             case ChainType.EVM: {
                 return swapQueryEvm.mutateAsync(squidRoute);
             }
-            // case ChainType.BTC: {
-            //   return swapQueryBitcoin.mutateAsync(squidRoute);
-            // }
-            // case ChainType.SOLANA: {
-            //   return swapQuerySolana.mutateAsync(squidRoute);
-            // }
+            case ChainType.BTC: {
+                return swapQueryBitcoin.mutateAsync(squidRoute);
+            }
+            case ChainType.SOLANA: {
+                return swapQuerySolana.mutateAsync(squidRoute);
+            }
             default:
                 throw new Error("Invalid parameters or chain not found");
         }
@@ -538,7 +511,6 @@ export const useExecuteTransaction = (squidRoute) => {
         fromPrice,
         toChain,
         fromChain,
-        executionState,
         signerReady,
     };
 };