@velora-dex/widget 0.0.23 → 0.1.0-rc.0

package/dist/hooks/swap/tradeFlow/useMarketFlow.js

@@ -1,4 +1,3 @@
-import { d as distExports } from '../../../_virtual/index.js';
 import { useAwaitTx, useEnsureTxReceipt } from '../../txs/queries/useAwaitTx.js';
 import { useChainId, useAccount } from 'wagmi';
 import { useSendMarketSwapTx } from '../prices/market/mutations/useSendMarketSwapTx.js';
@@ -8,7 +7,6 @@ import { applySlippage } from '../../../lib/utils/price.js';
 import { useSlippage } from '../../useSlippage.js';
 import { useMutation } from '@tanstack/react-query';
 import { useRef } from 'react';
-import { useInvalidateTokenDataQuery } from '../../tokens/balances/useInvalidateTokenData.js';
 import { UserCancelledError } from './common/errors.js';
 import { useReceiverAddressValue } from '../../../components/widget/ReceiverAddress/state/receiverAddressAtom.js';
 import { useSwapSide } from '../../../components/widget/SwapModeSwitcher/state/swapSideAtom.js';
@@ -16,241 +14,150 @@ import { useApproveOrPermit } from './common/useApproveOrPermit.js';
 import { useMarkPermit1Or2NonceAsUsed } from './common/useSignPermit1Or2.js';
 import { useWidgetConfig } from '../../../core/state/configAtom.js';
 import { useLogger } from '../../../core/logger.js';
-import { useTrackedPrice } from './common/useTrackedPrice.js';
 import { useConstructGasParams } from './common/useConstructGasParams.js';
+import { useMarketPriceQueryForPrice, useSubscribeToMarketPrice } from '../prices/market/queries/useMarketPriceQuery.js';
 
 const MARKET_SWAP_MUTATION_KEY = "runMarketSwapFlow";
-function useMarketFlow(t0) {
-  const $ = distExports.c(104);
-  const {
-    marketPrice
-  } = t0;
+function useMarketFlow({
+  marketPrice
+}) {
   const logger = useLogger("MarketFlow");
   const chainId = useChainId();
   const {
     resolvedSlippage
   } = useSlippage();
   const swapSide = useSwapSide();
-  let t1;
-  if ($[0] !== marketPrice || $[1] !== resolvedSlippage || $[2] !== swapSide) {
-    t1 = {
-      price: marketPrice,
-      slippage: resolvedSlippage,
-      side: swapSide
-    };
-    $[0] = marketPrice;
-    $[1] = resolvedSlippage;
-    $[2] = swapSide;
-    $[3] = t1;
-  } else {
-    t1 = $[3];
-  }
-  const trackedPrice = useTrackedPrice(t1);
-  let t2;
-  if ($[4] !== trackedPrice.get) {
-    t2 = trackedPrice.get.usingPrice();
-    $[4] = trackedPrice.get;
-    $[5] = t2;
-  } else {
-    t2 = $[5];
-  }
-  const usingPrice = t2;
-  const t3 = usingPrice?.srcToken ?? marketPrice?.srcToken;
-  let t4;
-  if ($[6] !== marketPrice?.srcAmount || $[7] !== trackedPrice.get) {
-    t4 = trackedPrice.get.approvedAmount() ?? marketPrice?.srcAmount;
-    $[6] = marketPrice?.srcAmount;
-    $[7] = trackedPrice.get;
-    $[8] = t4;
-  } else {
-    t4 = $[8];
-  }
-  const t5 = usingPrice?.side ?? swapSide;
-  let t6;
-  if ($[9] !== t3 || $[10] !== t4 || $[11] !== t5) {
-    t6 = {
-      srcToken: t3,
-      srcAmount: t4,
-      spenderContractType: "AugustusSwapper",
-      swapSide: t5
-    };
-    $[9] = t3;
-    $[10] = t4;
-    $[11] = t5;
-    $[12] = t6;
-  } else {
-    t6 = $[12];
-  }
   const {
     approval,
     signPermit,
     approveTxMut,
     signPermitMut
-  } = useApproveOrPermit(t6);
-  let t7;
-  if ($[13] !== logger) {
-    t7 = {
+  } = useApproveOrPermit({
+    srcToken: marketPrice?.srcToken,
+    // if we already approved some amount, save it in approval and signPermit objects
+    srcAmount: marketPrice?.srcAmount,
+    spenderContractType: "AugustusSwapper",
+    // marketPrice is the preferred source of truth
+    swapSide: marketPrice?.side ?? swapSide
+  });
+  const buildTxMut = useBuildTx({
+    chainId,
+    mutationOptions: {
       onSuccess: () => {
         logger.log("Build tx success");
       },
       onError: (error) => {
         logger.error("Build tx error", error);
       }
-    };
-    $[13] = logger;
-    $[14] = t7;
-  } else {
-    t7 = $[14];
-  }
-  let t8;
-  if ($[15] !== chainId || $[16] !== t7) {
-    t8 = {
-      chainId,
-      mutationOptions: t7
-    };
-    $[15] = chainId;
-    $[16] = t7;
-    $[17] = t8;
-  } else {
-    t8 = $[17];
-  }
-  const buildTxMut = useBuildTx(t8);
-  let t9;
-  if ($[18] !== buildTxMut.error || $[19] !== buildTxMut.isError || $[20] !== buildTxMut.isPending || $[21] !== buildTxMut.isSuccess) {
-    t9 = {
-      isPending: buildTxMut.isPending,
-      isError: buildTxMut.isError,
-      isSuccess: buildTxMut.isSuccess,
-      error: buildTxMut.error
-    };
-    $[18] = buildTxMut.error;
-    $[19] = buildTxMut.isError;
-    $[20] = buildTxMut.isPending;
-    $[21] = buildTxMut.isSuccess;
-    $[22] = t9;
-  } else {
-    t9 = $[22];
-  }
-  const buildTxParams = t9;
-  let t10;
-  if ($[23] !== logger) {
-    t10 = {
-      onSuccess: () => {
-        logger.log("Swap tx success");
-      },
-      onError: (error_0) => {
-        logger.error("Swap tx error", error_0);
-      }
-    };
-    $[23] = logger;
-    $[24] = t10;
-  } else {
-    t10 = $[24];
-  }
-  const sendSwapTxMut = useSendMarketSwapTx(t10);
-  let t11;
-  if ($[25] !== chainId || $[26] !== sendSwapTxMut.txHash) {
-    t11 = {
-      hash: sendSwapTxMut.txHash,
-      chainId
-    };
-    $[25] = chainId;
-    $[26] = sendSwapTxMut.txHash;
-    $[27] = t11;
-  } else {
-    t11 = $[27];
-  }
-  const swapTxMined = useAwaitTx(t11);
-  const t12 = sendSwapTxMut.isPending || swapTxMined.isLoading;
-  const t13 = sendSwapTxMut.isError || swapTxMined.isError;
-  const t14 = sendSwapTxMut.error || swapTxMined.error;
-  let t15;
-  if ($[28] !== sendSwapTxMut.isError || $[29] !== sendSwapTxMut.isPending || $[30] !== sendSwapTxMut.isSuccess || $[31] !== sendSwapTxMut.txHash || $[32] !== swapTxMined.data || $[33] !== swapTxMined.isError || $[34] !== swapTxMined.isLoading || $[35] !== swapTxMined.isSuccess || $[36] !== t12 || $[37] !== t13 || $[38] !== t14) {
-    t15 = {
-      txHash: sendSwapTxMut.txHash,
-      receipt: swapTxMined.data,
-      isConfirmingTX: sendSwapTxMut.isPending,
-      isConfirmingTxError: sendSwapTxMut.isError,
-      isTxSent: sendSwapTxMut.isSuccess,
-      isTxPending: swapTxMined.isLoading,
-      isTxMined: swapTxMined.isSuccess,
-      isTxAwaitingError: swapTxMined.isError,
-      isPending: t12,
-      isSuccess: swapTxMined.isSuccess,
-      isError: t13,
-      error: t14
-    };
-    $[28] = sendSwapTxMut.isError;
-    $[29] = sendSwapTxMut.isPending;
-    $[30] = sendSwapTxMut.isSuccess;
-    $[31] = sendSwapTxMut.txHash;
-    $[32] = swapTxMined.data;
-    $[33] = swapTxMined.isError;
-    $[34] = swapTxMined.isLoading;
-    $[35] = swapTxMined.isSuccess;
-    $[36] = t12;
-    $[37] = t13;
-    $[38] = t14;
-    $[39] = t15;
-  } else {
-    t15 = $[39];
-  }
-  const swap = t15;
+    }
+  });
+  const buildTxParams = {
+    isPending: buildTxMut.isPending,
+    isError: buildTxMut.isError,
+    isSuccess: buildTxMut.isSuccess,
+    error: buildTxMut.error
+  };
+  const sendSwapTxMut = useSendMarketSwapTx({
+    onSuccess: () => {
+      logger.log("Swap tx success");
+    },
+    onError: (error_0) => {
+      logger.error("Swap tx error", error_0);
+    }
+  });
+  const swapTxMined = useAwaitTx({
+    hash: sendSwapTxMut.txHash,
+    chainId
+  });
+  const swap = {
+    txHash: sendSwapTxMut.txHash,
+    receipt: swapTxMined.data,
+    /* tx sending */
+    isConfirmingTX: sendSwapTxMut.isPending,
+    isConfirmingTxError: sendSwapTxMut.isError,
+    isTxSent: sendSwapTxMut.isSuccess,
+    /* tx awaiting */
+    isTxPending: swapTxMined.isLoading,
+    isTxMined: swapTxMined.isSuccess,
+    isTxAwaitingError: swapTxMined.isError,
+    /* combined */
+    isPending: sendSwapTxMut.isPending || swapTxMined.isLoading,
+    isSuccess: swapTxMined.isSuccess,
+    // final success
+    isError: sendSwapTxMut.isError || swapTxMined.isError,
+    error: sendSwapTxMut.error || swapTxMined.error
+  };
   const {
     address: account
   } = useAccount();
   const ensureTxReceipt = useEnsureTxReceipt();
   const currentAbortControllerRef = useRef(null);
-  let t16;
-  if ($[40] === Symbol.for("react.memo_cache_sentinel")) {
-    t16 = () => {
-      currentAbortControllerRef.current?.abort(new UserCancelledError());
-      currentAbortControllerRef.current = null;
-    };
-    $[40] = t16;
-  } else {
-    t16 = $[40];
-  }
-  const cancelFlow = t16;
+  const usingPriceRef = useRef(null);
+  const cancelFlow = () => {
+    currentAbortControllerRef.current?.abort(new UserCancelledError());
+    currentAbortControllerRef.current = null;
+    usingPriceRef.current = null;
+  };
   const receiverAddress = useReceiverAddressValue();
-  let t17;
-  if ($[41] !== chainId) {
-    t17 = {
-      chainId
-    };
-    $[41] = chainId;
-    $[42] = t17;
-  } else {
-    t17 = $[42];
-  }
   const {
     markNonceAsUsed,
     clearNonce
-  } = useMarkPermit1Or2NonceAsUsed(t17);
+  } = useMarkPermit1Or2NonceAsUsed({
+    chainId
+  });
   const {
     constructGasParams
   } = useConstructGasParams();
   const partner = useWidgetConfig().partner;
-  let t18;
-  if ($[43] !== account || $[44] !== approval || $[45] !== approveTxMut || $[46] !== buildTxMut || $[47] !== chainId || $[48] !== clearNonce || $[49] !== constructGasParams || $[50] !== ensureTxReceipt || $[51] !== logger || $[52] !== markNonceAsUsed || $[53] !== marketPrice || $[54] !== partner || $[55] !== receiverAddress || $[56] !== resolvedSlippage || $[57] !== sendSwapTxMut || $[58] !== signPermit || $[59] !== signPermitMut || $[60] !== trackedPrice.get || $[61] !== trackedPrice.set) {
-    t18 = async (t192) => {
-      const {
-        onTxSent
-      } = t192 === void 0 ? {} : t192;
-      approveTxMut.reset();
-      signPermitMut.reset();
-      buildTxMut.reset();
-      sendSwapTxMut.reset();
-      const abortController = new AbortController();
-      currentAbortControllerRef.current = abortController;
-      const signal = abortController.signal;
-      let signedPermitResult;
-      let approveTxHash;
-      let approveTxReceipt;
-      const allowanceToSet = approval.allowanceToSet;
-      if (approval.needsApproval) {
+  const getQueryForPrice = useMarketPriceQueryForPrice();
+  const subscribeToPrice = useSubscribeToMarketPrice();
+  const submitSwapTx = async ({
+    onTxSent
+  } = {}) => {
+    approveTxMut.reset();
+    signPermitMut.reset();
+    buildTxMut.reset();
+    sendSwapTxMut.reset();
+    assert(marketPrice, "Market price is not available");
+    const abortController = new AbortController();
+    currentAbortControllerRef.current = abortController;
+    const signal = abortController.signal;
+    let signedPermitResult;
+    let approveTxHash;
+    let approveTxReceipt;
+    const allowanceToSet = approval.allowanceToSet;
+    let freshPrice = marketPrice;
+    let unsubscribeFromPrice;
+    usingPriceRef.current = freshPrice;
+    try {
+      if (approval.needsApproval && allowanceToSet) {
+        const queryKey = getQueryForPrice({
+          chainId,
+          price: freshPrice
+        })?.queryKey;
+        if (queryKey) {
+          const approvedAmount = allowanceToSet;
+          unsubscribeFromPrice = subscribeToPrice({
+            queryKey,
+            onData: (newPrice) => {
+              if (signal.aborted) {
+                unsubscribeFromPrice?.();
+                unsubscribeFromPrice = void 0;
+                return;
+              }
+              const amountsAfterSlippage = applySlippage({
+                srcAmount: newPrice.srcAmount,
+                destAmount: newPrice.destAmount
+              }, resolvedSlippage, newPrice.side);
+              if (approvedAmount >= BigInt(amountsAfterSlippage.srcAmount)) {
+                logger.log("~ fresh price ~", newPrice);
+                freshPrice = newPrice;
+                usingPriceRef.current = freshPrice;
+              }
+            }
+          });
+        }
         if (!signPermit.isPermitSupported || !signPermit.isPermitReadyToSign) {
-          trackedPrice.set.approvedAmount(allowanceToSet);
           approveTxHash = await approveTxMut.approveAsync({
             allowanceData: {
               allowanceToSet
@@ -275,7 +182,6 @@ function useMarketFlow(t0) {
           approveTxReceipt = await approveTxReceiptPromise;
           logger.log("~ approveTx ~ receipt:", approveTxReceipt);
         } else {
-          trackedPrice.set.approvedAmount(allowanceToSet);
           signedPermitResult = await signPermitMut.signPermitAsync({
             value: allowanceToSet
           });
@@ -283,17 +189,15 @@ function useMarketFlow(t0) {
       }
       signal.throwIfAborted();
       assert(account, "Account is not connected");
-      let marketPriceToUse = trackedPrice.get.usingPrice();
-      if (!marketPriceToUse) {
-        marketPriceToUse = marketPrice || null;
-        trackedPrice.set.usingPrice(marketPriceToUse);
-      }
+      const marketPriceToUse = freshPrice;
+      usingPriceRef.current = marketPriceToUse;
+      unsubscribeFromPrice?.();
+      unsubscribeFromPrice = void 0;
       assert(marketPriceToUse, "Market price is not available");
-      const amountsAfterSlippage = applySlippage({
+      const amountsAfterSlippage_0 = applySlippage({
         srcAmount: marketPriceToUse.srcAmount,
         destAmount: marketPriceToUse.destAmount
       }, resolvedSlippage, marketPriceToUse.side);
-      trackedPrice.set.finalPrice(marketPriceToUse);
       const gasParams = constructGasParams();
       const txParams = await buildTxMut.mutateAsync({
         swapTxInput: {
@@ -304,221 +208,116 @@ function useMarketFlow(t0) {
           srcDecimals: marketPriceToUse.srcDecimals,
           destDecimals: marketPriceToUse.destDecimals,
           partner,
+          /* @TODO fill in when and if available
+          referrer: "",
+          partnerAddress: "",
+          partnerFeeBps: 0, 
+          takeSurplus: false,*/
           permit: signedPermitResult?.permitEncodedArgs,
+          // just signed Permit signature
           priceRoute: marketPriceToUse,
-          ...amountsAfterSlippage
+          ...amountsAfterSlippage_0
         },
-        swapTxOptions: gasParams
+        swapTxOptions: (
+          // ignoreChecks: true,
+          // ignoreGasEstimate: true,
+          // ignoreAllowance: true,
+          // onlyParams: true,
+          // @TODO turn on ignore options when necessary (for Safe),
+          gasParams
+        )
       });
       signal.throwIfAborted();
       const swapTxHash = await sendSwapTxMut.sendTransactionAsync(txParams);
       if (signedPermitResult) {
         markNonceAsUsed(signedPermitResult.signedPermitData);
       }
-      try {
-        const swapTxReceiptPromise = ensureTxReceipt({
-          hash: swapTxHash,
+      const swapTxReceiptPromise = ensureTxReceipt({
+        hash: swapTxHash,
+        chainId,
+        onReplaced: (data_0) => {
+          logger.log("onReplaced:swapTx", swapTxHash, data_0);
+        }
+      });
+      if (onTxSent) {
+        onTxSent({
           chainId,
-          onReplaced: (data_0) => {
-            logger.log("onReplaced:swapTx", swapTxHash, data_0);
-          }
+          txHash: swapTxHash,
+          actionType: "swap",
+          receiptPromise: swapTxReceiptPromise
         });
-        if (onTxSent) {
-          onTxSent({
-            chainId,
-            txHash: swapTxHash,
-            actionType: "swap",
-            receiptPromise: swapTxReceiptPromise
-          });
-        }
-        const swapTxReceipt = await swapTxReceiptPromise;
-        logger.log("~ swapTx ~ receipt:", swapTxReceipt);
-        return {
-          tradeFlowType: "marketSwap",
-          approve: {
-            txHash: approveTxHash,
-            receipt: approveTxReceipt
-          },
-          swap: {
-            txHash: swapTxHash,
-            receipt: swapTxReceipt
-          },
-          marketPrice: marketPriceToUse,
-          account
-        };
-      } catch (t202) {
-        const error_1 = t202;
-        if (signedPermitResult) {
-          clearNonce(signedPermitResult.signedPermitData);
-        }
-        throw error_1;
       }
-    };
-    $[43] = account;
-    $[44] = approval;
-    $[45] = approveTxMut;
-    $[46] = buildTxMut;
-    $[47] = chainId;
-    $[48] = clearNonce;
-    $[49] = constructGasParams;
-    $[50] = ensureTxReceipt;
-    $[51] = logger;
-    $[52] = markNonceAsUsed;
-    $[53] = marketPrice;
-    $[54] = partner;
-    $[55] = receiverAddress;
-    $[56] = resolvedSlippage;
-    $[57] = sendSwapTxMut;
-    $[58] = signPermit;
-    $[59] = signPermitMut;
-    $[60] = trackedPrice.get;
-    $[61] = trackedPrice.set;
-    $[62] = t18;
-  } else {
-    t18 = $[62];
-  }
-  const submitSwapTx = t18;
-  const invalidateTokenData = useInvalidateTokenDataQuery();
-  let t19;
-  if ($[63] === Symbol.for("react.memo_cache_sentinel")) {
-    t19 = [MARKET_SWAP_MUTATION_KEY];
-    $[63] = t19;
-  } else {
-    t19 = $[63];
-  }
-  let t20;
-  let t21;
-  if ($[64] !== logger) {
-    t20 = (data_1) => {
+      const swapTxReceipt = await swapTxReceiptPromise;
+      logger.log("~ swapTx ~ receipt:", swapTxReceipt);
+      return {
+        tradeFlowType: "marketSwap",
+        approve: {
+          txHash: approveTxHash,
+          receipt: approveTxReceipt
+        },
+        swap: {
+          txHash: swapTxHash,
+          receipt: swapTxReceipt
+        },
+        marketPrice: marketPriceToUse,
+        // @TODO add whatever else may be relevant
+        account,
+        receiverAddress
+      };
+    } catch (error_1) {
+      if (signedPermitResult) {
+        clearNonce(signedPermitResult.signedPermitData);
+      }
+      throw error_1;
+    } finally {
+      unsubscribeFromPrice?.();
+    }
+  };
+  const marketSwapMut = useMutation({
+    mutationFn: submitSwapTx,
+    mutationKey: [MARKET_SWAP_MUTATION_KEY],
+    onSuccess: (data_1) => {
       logger.log("Swap tx success", data_1);
-    };
-    t21 = (error_2) => {
+    },
+    onError: (error_2) => {
       logger.error("Swap tx error", error_2);
-    };
-    $[64] = logger;
-    $[65] = t20;
-    $[66] = t21;
-  } else {
-    t20 = $[65];
-    t21 = $[66];
-  }
-  let t22;
-  if ($[67] !== invalidateTokenData || $[68] !== logger || $[69] !== trackedPrice) {
-    t22 = () => {
-      logger.log("Swap tx settled, invalidating balances and allowances");
-      invalidateTokenData({
-        nonces: true
-      });
-      trackedPrice.resetTrackedPrice();
-    };
-    $[67] = invalidateTokenData;
-    $[68] = logger;
-    $[69] = trackedPrice;
-    $[70] = t22;
-  } else {
-    t22 = $[70];
-  }
-  let t23;
-  if ($[71] !== submitSwapTx || $[72] !== t20 || $[73] !== t21 || $[74] !== t22) {
-    t23 = {
-      mutationFn: submitSwapTx,
-      mutationKey: t19,
-      onSuccess: t20,
-      onError: t21,
-      onSettled: t22
-    };
-    $[71] = submitSwapTx;
-    $[72] = t20;
-    $[73] = t21;
-    $[74] = t22;
-    $[75] = t23;
-  } else {
-    t23 = $[75];
-  }
-  const marketSwapMut = useMutation(t23);
+    },
+    onSettled: () => {
+      logger.log("Swap tx settled");
+    }
+  });
   const runMarketSwapFlow = marketSwapMut.mutateAsync;
-  let t24;
-  if ($[76] !== approveTxMut || $[77] !== buildTxMut || $[78] !== marketSwapMut || $[79] !== sendSwapTxMut || $[80] !== signPermitMut || $[81] !== trackedPrice) {
-    t24 = () => {
-      trackedPrice.resetTrackedPrice();
-      approveTxMut.reset();
-      signPermitMut.reset();
-      buildTxMut.reset();
-      sendSwapTxMut.reset();
-      marketSwapMut.reset();
-    };
-    $[76] = approveTxMut;
-    $[77] = buildTxMut;
-    $[78] = marketSwapMut;
-    $[79] = sendSwapTxMut;
-    $[80] = signPermitMut;
-    $[81] = trackedPrice;
-    $[82] = t24;
-  } else {
-    t24 = $[82];
-  }
-  const reset = t24;
-  let t25;
-  if ($[83] !== reset || $[84] !== runMarketSwapFlow) {
-    t25 = (options) => {
-      reset();
-      return runMarketSwapFlow(options);
-    };
-    $[83] = reset;
-    $[84] = runMarketSwapFlow;
-    $[85] = t25;
-  } else {
-    t25 = $[85];
-  }
-  const retryFlow = t25;
-  let t26;
-  if ($[86] !== marketPrice || $[87] !== trackedPrice.get) {
-    t26 = trackedPrice.get.finalPrice() || trackedPrice.get.usingPrice() || marketPrice;
-    $[86] = marketPrice;
-    $[87] = trackedPrice.get;
-    $[88] = t26;
-  } else {
-    t26 = $[88];
-  }
-  const usedPrice = t26;
-  let t27;
-  if ($[89] !== approval || $[90] !== buildTxParams || $[91] !== chainId || $[92] !== marketSwapMut.data || $[93] !== marketSwapMut.error || $[94] !== marketSwapMut.isError || $[95] !== marketSwapMut.isPending || $[96] !== marketSwapMut.isSuccess || $[97] !== reset || $[98] !== retryFlow || $[99] !== runMarketSwapFlow || $[100] !== signPermit || $[101] !== swap || $[102] !== usedPrice) {
-    t27 = {
-      chainId,
-      runMarketSwapFlow,
-      reset,
-      cancelFlow,
-      retryFlow,
-      approval,
-      signPermit,
-      buildTxParams,
-      swap,
-      isPending: marketSwapMut.isPending,
-      isSuccess: marketSwapMut.isSuccess,
-      isError: marketSwapMut.isError,
-      error: marketSwapMut.error,
-      result: marketSwapMut.data,
-      usedPrice
-    };
-    $[89] = approval;
-    $[90] = buildTxParams;
-    $[91] = chainId;
-    $[92] = marketSwapMut.data;
-    $[93] = marketSwapMut.error;
-    $[94] = marketSwapMut.isError;
-    $[95] = marketSwapMut.isPending;
-    $[96] = marketSwapMut.isSuccess;
-    $[97] = reset;
-    $[98] = retryFlow;
-    $[99] = runMarketSwapFlow;
-    $[100] = signPermit;
-    $[101] = swap;
-    $[102] = usedPrice;
-    $[103] = t27;
-  } else {
-    t27 = $[103];
-  }
-  return t27;
+  const reset = () => {
+    usingPriceRef.current = null;
+    approveTxMut.reset();
+    signPermitMut.reset();
+    buildTxMut.reset();
+    sendSwapTxMut.reset();
+    marketSwapMut.reset();
+  };
+  const retryFlow = (options) => {
+    reset();
+    return runMarketSwapFlow(options);
+  };
+  const usedPrice = usingPriceRef.current || marketPrice;
+  return {
+    chainId,
+    runMarketSwapFlow,
+    reset,
+    cancelFlow,
+    retryFlow,
+    approval,
+    signPermit,
+    buildTxParams,
+    swap,
+    // marketSwapMut includes all steps' queries and mutations and returns more precise errors (including cancellation)
+    isPending: marketSwapMut.isPending,
+    isSuccess: marketSwapMut.isSuccess,
+    isError: marketSwapMut.isError,
+    error: marketSwapMut.error,
+    result: marketSwapMut.data,
+    usedPrice
+  };
 }
 
 export { useMarketFlow };