@velora-dex/widget 0.0.15 → 0.0.17

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

@@ -1,6 +1,4 @@
 import { d as distExports } from '../../../_virtual/index.js';
-import { useGenericTokenAllowanceMin } from '../../tokens/allowance/useGenericTokenAllowance.js';
-import { useApprove } from '../../txs/mutations/useApprove.js';
 import { useAwaitTx, useEnsureTxReceipt } from '../../txs/queries/useAwaitTx.js';
 import { useChainId, useAccount } from 'wagmi';
 import { useSendMarketSwapTx } from '../prices/market/mutations/useSendMarketSwapTx.js';
@@ -13,330 +11,234 @@ 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 { useSignTokenPermit1, useMarkPermit1NonceAsUsed } from '../../permit/hooks/useSignTokenFromPermit1.js';
+import { useSwapSide } from '../../../components/widget/SwapModeSwitcher/state/swapSideAtom.js';
+import { useApproveOrPermit } from './common/useApproveOrPermit.js';
+import { useMarkPermit1Or2NonceAsUsed } from './common/useSignPermit1Or2.js';
+import { useWidgetConfig } from '../../../widget/state/configAtom.js';
+import { useLogger } from '../../../widget/logger.js';
+import { useTrackedPrice } from './common/useTrackedPrice.js';
+import { useConstructGasParams } from './common/useConstructGasParams.js';
 
 const MARKET_SWAP_MUTATION_KEY = "runMarketSwapFlow";
 function useMarketFlow(t0) {
-  const $ = distExports.c(117);
+  const $ = distExports.c(104);
   const {
     marketPrice
   } = t0;
+  const logger = useLogger("MarketFlow");
   const chainId = useChainId();
-  const t1 = marketPrice?.srcToken;
-  const t2 = marketPrice?.srcAmount;
-  let t3;
-  if ($[0] !== chainId || $[1] !== t1 || $[2] !== t2) {
-    t3 = {
-      tokenAddress: t1,
-      amountToApproveInWei: t2,
-      spenderContractType: "AugustusSwapper",
-      chainId
+  const {
+    resolvedSlippage
+  } = useSlippage();
+  const swapSide = useSwapSide();
+  let t1;
+  if ($[0] !== marketPrice || $[1] !== resolvedSlippage || $[2] !== swapSide) {
+    t1 = {
+      price: marketPrice,
+      slippage: resolvedSlippage,
+      side: swapSide
     };
-    $[0] = chainId;
-    $[1] = t1;
-    $[2] = t2;
-    $[3] = t3;
+    $[0] = marketPrice;
+    $[1] = resolvedSlippage;
+    $[2] = swapSide;
+    $[3] = t1;
   } else {
-    t3 = $[3];
+    t1 = $[3];
   }
-  const allowance = useGenericTokenAllowanceMin(t3);
-  let t4;
-  if ($[4] !== marketPrice) {
-    t4 = marketPrice?.srcToken ? {
-      address: marketPrice.srcToken
-    } : void 0;
-    $[4] = marketPrice;
-    $[5] = t4;
+  const trackedPrice = useTrackedPrice(t1);
+  let t2;
+  if ($[4] !== trackedPrice.get) {
+    t2 = trackedPrice.get.usingPrice();
+    $[4] = trackedPrice.get;
+    $[5] = t2;
   } else {
-    t4 = $[5];
+    t2 = $[5];
   }
-  let t5;
-  if ($[6] !== allowance.allowanceToSet) {
-    t5 = {
-      allowanceToSet: allowance.allowanceToSet
-    };
-    $[6] = allowance.allowanceToSet;
-    $[7] = t5;
+  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 {
-    t5 = $[7];
+    t4 = $[8];
   }
+  const t5 = usingPrice?.side ?? swapSide;
   let t6;
-  if ($[8] !== allowance.spender || $[9] !== t4 || $[10] !== t5) {
+  if ($[9] !== t3 || $[10] !== t4 || $[11] !== t5) {
     t6 = {
-      token: t4,
-      allowanceData: t5,
-      spender: allowance.spender,
-      onSuccess: _temp,
-      onError: _temp2
-    };
-    $[8] = allowance.spender;
-    $[9] = t4;
-    $[10] = t5;
-    $[11] = t6;
-  } else {
-    t6 = $[11];
-  }
-  const approveTxMut = useApprove(t6);
-  const t7 = marketPrice?.srcToken;
-  let t8;
-  if ($[12] !== chainId || $[13] !== t7) {
-    t8 = {
-      address: t7,
-      network: chainId
-    };
-    $[12] = chainId;
-    $[13] = t7;
-    $[14] = t8;
-  } else {
-    t8 = $[14];
-  }
-  const t9 = allowance.spender;
-  let t10;
-  if ($[15] !== allowance.allowanceToSet || $[16] !== allowance.needsApproval || $[17] !== t8 || $[18] !== t9) {
-    t10 = {
-      token: t8,
-      value: allowance.allowanceToSet,
-      spender: t9,
-      enabled: allowance.needsApproval,
-      onSuccess: _temp3,
-      onError: _temp4
-    };
-    $[15] = allowance.allowanceToSet;
-    $[16] = allowance.needsApproval;
-    $[17] = t8;
-    $[18] = t9;
-    $[19] = t10;
-  } else {
-    t10 = $[19];
-  }
-  const signPermit1Mut = useSignTokenPermit1(t10);
-  const t11 = allowance.spender;
-  let t12;
-  if ($[20] !== allowance.allowanceToSet || $[21] !== signPermit1Mut.error || $[22] !== signPermit1Mut.isError || $[23] !== signPermit1Mut.isPending || $[24] !== signPermit1Mut.isPermitReadyToSign || $[25] !== signPermit1Mut.isPermitSupported || $[26] !== signPermit1Mut.isSuccess || $[27] !== signPermit1Mut.permit1EncodedArgs || $[28] !== signPermit1Mut.permitFetchingState.isPending || $[29] !== signPermit1Mut.permitSigningState.isPending || $[30] !== signPermit1Mut.permitSigningState.isSuccess || $[31] !== signPermit1Mut.signature || $[32] !== t11) {
-    t12 = {
-      isPermitSupported: signPermit1Mut.isPermitSupported,
-      isPermitReadyToSign: signPermit1Mut.isPermitReadyToSign,
-      amountToPermit: allowance.allowanceToSet,
-      spender: t11,
-      isLoadingPermitData: signPermit1Mut.permitFetchingState.isPending,
-      isSigningPermit: signPermit1Mut.permitSigningState.isPending,
-      isPermitSigned: signPermit1Mut.permitSigningState.isSuccess,
-      signature: signPermit1Mut.signature,
-      permitEncodedArgs: signPermit1Mut.permit1EncodedArgs,
-      isPending: signPermit1Mut.isPending,
-      isSuccess: signPermit1Mut.isSuccess,
-      isError: signPermit1Mut.isError,
-      error: signPermit1Mut.error
-    };
-    $[20] = allowance.allowanceToSet;
-    $[21] = signPermit1Mut.error;
-    $[22] = signPermit1Mut.isError;
-    $[23] = signPermit1Mut.isPending;
-    $[24] = signPermit1Mut.isPermitReadyToSign;
-    $[25] = signPermit1Mut.isPermitSupported;
-    $[26] = signPermit1Mut.isSuccess;
-    $[27] = signPermit1Mut.permit1EncodedArgs;
-    $[28] = signPermit1Mut.permitFetchingState.isPending;
-    $[29] = signPermit1Mut.permitSigningState.isPending;
-    $[30] = signPermit1Mut.permitSigningState.isSuccess;
-    $[31] = signPermit1Mut.signature;
-    $[32] = t11;
-    $[33] = t12;
-  } else {
-    t12 = $[33];
-  }
-  const signPermit = t12;
-  let t13;
-  if ($[34] !== approveTxMut.txHash || $[35] !== chainId) {
-    t13 = {
-      hash: approveTxMut.txHash,
-      chainId
-    };
-    $[34] = approveTxMut.txHash;
-    $[35] = chainId;
-    $[36] = t13;
-  } else {
-    t13 = $[36];
-  }
-  const approveTxMined = useAwaitTx(t13);
-  const t14 = allowance.spender;
-  const t15 = allowance.needsApproval && (approveTxMut.isPending || approveTxMined.isLoading);
-  const t16 = allowance.needsApproval && (approveTxMut.isError || approveTxMined.isError);
-  const t17 = !allowance.needsApproval || approveTxMined.isSuccess;
-  const t18 = allowance.needsApproval ? approveTxMut.error || approveTxMined.error : null;
-  let t19;
-  if ($[37] !== allowance.allowanceToSet || $[38] !== allowance.isLoadingPrerequisites || $[39] !== allowance.needsApproval || $[40] !== approveTxMined.data || $[41] !== approveTxMined.isLoading || $[42] !== approveTxMined.isSuccess || $[43] !== approveTxMut.isPending || $[44] !== approveTxMut.isSuccess || $[45] !== approveTxMut.txHash || $[46] !== t14 || $[47] !== t15 || $[48] !== t16 || $[49] !== t17 || $[50] !== t18) {
-    t19 = {
-      needsApproval: allowance.needsApproval,
-      allowanceToSet: allowance.allowanceToSet,
-      spender: t14,
-      txHash: approveTxMut.txHash,
-      receipt: approveTxMined.data,
-      isLoadingAllowance: allowance.isLoadingPrerequisites,
-      isConfirmingTX: approveTxMut.isPending,
-      isTxSent: approveTxMut.isSuccess,
-      isTxPending: approveTxMined.isLoading,
-      isTxMined: approveTxMined.isSuccess,
-      isPending: t15,
-      isError: t16,
-      isSuccess: t17,
-      error: t18
+      srcToken: t3,
+      srcAmount: t4,
+      spenderContractType: "AugustusSwapper",
+      swapSide: t5
     };
-    $[37] = allowance.allowanceToSet;
-    $[38] = allowance.isLoadingPrerequisites;
-    $[39] = allowance.needsApproval;
-    $[40] = approveTxMined.data;
-    $[41] = approveTxMined.isLoading;
-    $[42] = approveTxMined.isSuccess;
-    $[43] = approveTxMut.isPending;
-    $[44] = approveTxMut.isSuccess;
-    $[45] = approveTxMut.txHash;
-    $[46] = t14;
-    $[47] = t15;
-    $[48] = t16;
-    $[49] = t17;
-    $[50] = t18;
-    $[51] = t19;
+    $[9] = t3;
+    $[10] = t4;
+    $[11] = t5;
+    $[12] = t6;
   } else {
-    t19 = $[51];
+    t6 = $[12];
   }
-  const approval = t19;
-  let t20;
-  if ($[52] === Symbol.for("react.memo_cache_sentinel")) {
-    t20 = {
-      onSuccess: _temp5,
-      onError: _temp6
+  const {
+    approval,
+    signPermit,
+    approveTxMut,
+    signPermitMut
+  } = useApproveOrPermit(t6);
+  let t7;
+  if ($[13] !== logger) {
+    t7 = {
+      onSuccess: () => {
+        logger.log("Build tx success");
+      },
+      onError: (error) => {
+        logger.error("Build tx error", error);
+      }
     };
-    $[52] = t20;
+    $[13] = logger;
+    $[14] = t7;
   } else {
-    t20 = $[52];
+    t7 = $[14];
   }
-  let t21;
-  if ($[53] !== chainId) {
-    t21 = {
+  let t8;
+  if ($[15] !== chainId || $[16] !== t7) {
+    t8 = {
       chainId,
-      mutationOptions: t20
+      mutationOptions: t7
     };
-    $[53] = chainId;
-    $[54] = t21;
+    $[15] = chainId;
+    $[16] = t7;
+    $[17] = t8;
   } else {
-    t21 = $[54];
+    t8 = $[17];
   }
-  const buildTxMut = useBuildTx(t21);
-  let t22;
-  if ($[55] !== buildTxMut.error || $[56] !== buildTxMut.isError || $[57] !== buildTxMut.isPending || $[58] !== buildTxMut.isSuccess) {
-    t22 = {
+  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
     };
-    $[55] = buildTxMut.error;
-    $[56] = buildTxMut.isError;
-    $[57] = buildTxMut.isPending;
-    $[58] = buildTxMut.isSuccess;
-    $[59] = t22;
+    $[18] = buildTxMut.error;
+    $[19] = buildTxMut.isError;
+    $[20] = buildTxMut.isPending;
+    $[21] = buildTxMut.isSuccess;
+    $[22] = t9;
   } else {
-    t22 = $[59];
+    t9 = $[22];
   }
-  const buildTxParams = t22;
-  let t23;
-  if ($[60] === Symbol.for("react.memo_cache_sentinel")) {
-    t23 = {
-      onSuccess: _temp7,
-      onError: _temp8
+  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);
+      }
     };
-    $[60] = t23;
+    $[23] = logger;
+    $[24] = t10;
   } else {
-    t23 = $[60];
+    t10 = $[24];
   }
-  const sendSwapTxMut = useSendMarketSwapTx(t23);
-  let t24;
-  if ($[61] !== chainId || $[62] !== sendSwapTxMut.txHash) {
-    t24 = {
+  const sendSwapTxMut = useSendMarketSwapTx(t10);
+  let t11;
+  if ($[25] !== chainId || $[26] !== sendSwapTxMut.txHash) {
+    t11 = {
       hash: sendSwapTxMut.txHash,
       chainId
     };
-    $[61] = chainId;
-    $[62] = sendSwapTxMut.txHash;
-    $[63] = t24;
+    $[25] = chainId;
+    $[26] = sendSwapTxMut.txHash;
+    $[27] = t11;
   } else {
-    t24 = $[63];
+    t11 = $[27];
   }
-  const swapTxMined = useAwaitTx(t24);
-  const t25 = sendSwapTxMut.isPending || swapTxMined.isLoading;
-  const t26 = sendSwapTxMut.isError || swapTxMined.isError;
-  const t27 = sendSwapTxMut.error || swapTxMined.error;
-  let t28;
-  if ($[64] !== sendSwapTxMut.isPending || $[65] !== sendSwapTxMut.isSuccess || $[66] !== sendSwapTxMut.txHash || $[67] !== swapTxMined.data || $[68] !== swapTxMined.isLoading || $[69] !== swapTxMined.isSuccess || $[70] !== t25 || $[71] !== t26 || $[72] !== t27) {
-    t28 = {
+  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,
-      isPending: t25,
+      isTxAwaitingError: swapTxMined.isError,
+      isPending: t12,
       isSuccess: swapTxMined.isSuccess,
-      isError: t26,
-      error: t27
+      isError: t13,
+      error: t14
     };
-    $[64] = sendSwapTxMut.isPending;
-    $[65] = sendSwapTxMut.isSuccess;
-    $[66] = sendSwapTxMut.txHash;
-    $[67] = swapTxMined.data;
-    $[68] = swapTxMined.isLoading;
-    $[69] = swapTxMined.isSuccess;
-    $[70] = t25;
-    $[71] = t26;
-    $[72] = t27;
-    $[73] = t28;
+    $[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 {
-    t28 = $[73];
+    t15 = $[39];
   }
-  const swap = t28;
+  const swap = t15;
   const {
     address: account
   } = useAccount();
-  const {
-    resolvedSlippage
-  } = useSlippage();
   const ensureTxReceipt = useEnsureTxReceipt();
   const currentAbortControllerRef = useRef(null);
-  let t29;
-  if ($[74] === Symbol.for("react.memo_cache_sentinel")) {
-    t29 = () => {
+  let t16;
+  if ($[40] === Symbol.for("react.memo_cache_sentinel")) {
+    t16 = () => {
       currentAbortControllerRef.current?.abort(new UserCancelledError());
       currentAbortControllerRef.current = null;
     };
-    $[74] = t29;
+    $[40] = t16;
   } else {
-    t29 = $[74];
+    t16 = $[40];
   }
-  const cancelFlow = t29;
+  const cancelFlow = t16;
   const receiverAddress = useReceiverAddressValue();
-  let t30;
-  if ($[75] !== chainId) {
-    t30 = {
+  let t17;
+  if ($[41] !== chainId) {
+    t17 = {
       chainId
     };
-    $[75] = chainId;
-    $[76] = t30;
+    $[41] = chainId;
+    $[42] = t17;
   } else {
-    t30 = $[76];
+    t17 = $[42];
   }
   const {
     markNonceAsUsed,
     clearNonce
-  } = useMarkPermit1NonceAsUsed(t30);
-  let t31;
-  if ($[77] !== account || $[78] !== approval || $[79] !== approveTxMut || $[80] !== buildTxMut || $[81] !== chainId || $[82] !== clearNonce || $[83] !== ensureTxReceipt || $[84] !== markNonceAsUsed || $[85] !== marketPrice || $[86] !== receiverAddress || $[87] !== resolvedSlippage || $[88] !== sendSwapTxMut || $[89] !== signPermit || $[90] !== signPermit1Mut) {
-    t31 = async (t322) => {
+  } = useMarkPermit1Or2NonceAsUsed(t17);
+  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
-      } = t322 === void 0 ? {} : t322;
+      } = t192 === void 0 ? {} : t192;
       approveTxMut.reset();
-      signPermit1Mut.reset();
+      signPermitMut.reset();
       buildTxMut.reset();
       sendSwapTxMut.reset();
       const abortController = new AbortController();
@@ -345,49 +247,68 @@ function useMarketFlow(t0) {
       let signedPermitResult;
       let approveTxHash;
       let approveTxReceipt;
+      const allowanceToSet = approval.allowanceToSet;
       if (approval.needsApproval) {
         if (!signPermit.isPermitSupported || !signPermit.isPermitReadyToSign) {
-          approveTxHash = await approveTxMut.approveAsync();
+          trackedPrice.set.approvedAmount(allowanceToSet);
+          approveTxHash = await approveTxMut.approveAsync({
+            allowanceData: {
+              allowanceToSet
+            }
+          });
           signal.throwIfAborted();
           const approveTxReceiptPromise = ensureTxReceipt({
             hash: approveTxHash,
             chainId,
             onReplaced: (data) => {
-              console.log("onReplaced:approveTx", approveTxHash, data);
+              logger.log("onReplaced:approveTx", approveTxHash, data);
             }
           });
           if (onTxSent) {
             onTxSent({
+              chainId,
               txHash: approveTxHash,
               actionType: "approve",
               receiptPromise: approveTxReceiptPromise
             });
           }
           approveTxReceipt = await approveTxReceiptPromise;
-          console.log("🚀 ~ approveTx ~ receipt:", approveTxReceipt);
+          logger.log("~ approveTx ~ receipt:", approveTxReceipt);
         } else {
-          signedPermitResult = await signPermit1Mut.signPermit1Async();
+          trackedPrice.set.approvedAmount(allowanceToSet);
+          signedPermitResult = await signPermitMut.signPermitAsync({
+            value: allowanceToSet
+          });
         }
       }
       signal.throwIfAborted();
       assert(account, "Account is not connected");
-      assert(marketPrice, "Market price is not available");
+      let marketPriceToUse = trackedPrice.get.usingPrice();
+      if (!marketPriceToUse) {
+        marketPriceToUse = marketPrice || null;
+        trackedPrice.set.usingPrice(marketPriceToUse);
+      }
+      assert(marketPriceToUse, "Market price is not available");
       const amountsAfterSlippage = applySlippage({
-        srcAmount: marketPrice.srcAmount,
-        destAmount: marketPrice.destAmount
-      }, resolvedSlippage, marketPrice.side);
+        srcAmount: marketPriceToUse.srcAmount,
+        destAmount: marketPriceToUse.destAmount
+      }, resolvedSlippage, marketPriceToUse.side);
+      trackedPrice.set.finalPrice(marketPriceToUse);
+      const gasParams = constructGasParams();
       const txParams = await buildTxMut.mutateAsync({
         swapTxInput: {
           userAddress: account,
           receiver: receiverAddress,
-          srcToken: marketPrice.srcToken,
-          destToken: marketPrice.destToken,
-          srcDecimals: marketPrice.srcDecimals,
-          destDecimals: marketPrice.destDecimals,
-          permit: signedPermitResult?.permit1EncodedArgs,
-          priceRoute: marketPrice,
+          srcToken: marketPriceToUse.srcToken,
+          destToken: marketPriceToUse.destToken,
+          srcDecimals: marketPriceToUse.srcDecimals,
+          destDecimals: marketPriceToUse.destDecimals,
+          partner,
+          permit: signedPermitResult?.permitEncodedArgs,
+          priceRoute: marketPriceToUse,
           ...amountsAfterSlippage
-        }
+        },
+        swapTxOptions: gasParams
       });
       signal.throwIfAborted();
       const swapTxHash = await sendSwapTxMut.sendTransactionAsync(txParams);
@@ -399,18 +320,19 @@ function useMarketFlow(t0) {
           hash: swapTxHash,
           chainId,
           onReplaced: (data_0) => {
-            console.log("onReplaced:swapTx", swapTxHash, data_0);
+            logger.log("onReplaced:swapTx", swapTxHash, data_0);
           }
         });
         if (onTxSent) {
           onTxSent({
+            chainId,
             txHash: swapTxHash,
             actionType: "swap",
             receiptPromise: swapTxReceiptPromise
           });
         }
         const swapTxReceipt = await swapTxReceiptPromise;
-        console.log("🚀 ~ swapTx ~ receipt:", swapTxReceipt);
+        logger.log("~ swapTx ~ receipt:", swapTxReceipt);
         return {
           tradeFlowType: "marketSwap",
           approve: {
@@ -421,99 +343,152 @@ function useMarketFlow(t0) {
             txHash: swapTxHash,
             receipt: swapTxReceipt
           },
-          marketPrice,
+          marketPrice: marketPriceToUse,
           account
         };
-      } catch (t332) {
-        const error_3 = t332;
+      } catch (t202) {
+        const error_1 = t202;
         if (signedPermitResult) {
           clearNonce(signedPermitResult.signedPermitData);
         }
-        throw error_3;
+        throw error_1;
       }
     };
-    $[77] = account;
-    $[78] = approval;
-    $[79] = approveTxMut;
-    $[80] = buildTxMut;
-    $[81] = chainId;
-    $[82] = clearNonce;
-    $[83] = ensureTxReceipt;
-    $[84] = markNonceAsUsed;
-    $[85] = marketPrice;
-    $[86] = receiverAddress;
-    $[87] = resolvedSlippage;
-    $[88] = sendSwapTxMut;
-    $[89] = signPermit;
-    $[90] = signPermit1Mut;
-    $[91] = t31;
+    $[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 {
-    t31 = $[91];
+    t18 = $[62];
   }
-  const submitSwapTx = t31;
+  const submitSwapTx = t18;
   const invalidateTokenData = useInvalidateTokenDataQuery();
-  let t32;
-  if ($[92] === Symbol.for("react.memo_cache_sentinel")) {
-    t32 = [MARKET_SWAP_MUTATION_KEY];
-    $[92] = t32;
+  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) => {
+      logger.log("Swap tx success", data_1);
+    };
+    t21 = (error_2) => {
+      logger.error("Swap tx error", error_2);
+    };
+    $[64] = logger;
+    $[65] = t20;
+    $[66] = t21;
   } else {
-    t32 = $[92];
+    t20 = $[65];
+    t21 = $[66];
   }
-  let t33;
-  if ($[93] !== invalidateTokenData) {
-    t33 = () => {
-      console.log("Swap tx settled, invalidating balances and allowances");
+  let t22;
+  if ($[67] !== invalidateTokenData || $[68] !== logger || $[69] !== trackedPrice) {
+    t22 = () => {
+      logger.log("Swap tx settled, invalidating balances and allowances");
       invalidateTokenData({
         nonces: true
       });
+      trackedPrice.resetTrackedPrice();
     };
-    $[93] = invalidateTokenData;
-    $[94] = t33;
+    $[67] = invalidateTokenData;
+    $[68] = logger;
+    $[69] = trackedPrice;
+    $[70] = t22;
   } else {
-    t33 = $[94];
+    t22 = $[70];
   }
-  let t34;
-  if ($[95] !== submitSwapTx || $[96] !== t33) {
-    t34 = {
+  let t23;
+  if ($[71] !== submitSwapTx || $[72] !== t20 || $[73] !== t21 || $[74] !== t22) {
+    t23 = {
       mutationFn: submitSwapTx,
-      mutationKey: t32,
-      onSuccess: _temp9,
-      onError: _temp0,
-      onSettled: t33
+      mutationKey: t19,
+      onSuccess: t20,
+      onError: t21,
+      onSettled: t22
     };
-    $[95] = submitSwapTx;
-    $[96] = t33;
-    $[97] = t34;
+    $[71] = submitSwapTx;
+    $[72] = t20;
+    $[73] = t21;
+    $[74] = t22;
+    $[75] = t23;
   } else {
-    t34 = $[97];
+    t23 = $[75];
   }
-  const marketSwapMut = useMutation(t34);
-  let t35;
-  if ($[98] !== approveTxMut || $[99] !== buildTxMut || $[100] !== marketSwapMut || $[101] !== sendSwapTxMut || $[102] !== signPermit1Mut) {
-    t35 = () => {
+  const marketSwapMut = useMutation(t23);
+  const runMarketSwapFlow = marketSwapMut.mutateAsync;
+  let t24;
+  if ($[76] !== approveTxMut || $[77] !== buildTxMut || $[78] !== marketSwapMut || $[79] !== sendSwapTxMut || $[80] !== signPermitMut || $[81] !== trackedPrice) {
+    t24 = () => {
+      trackedPrice.resetTrackedPrice();
       approveTxMut.reset();
-      signPermit1Mut.reset();
+      signPermitMut.reset();
       buildTxMut.reset();
       sendSwapTxMut.reset();
       marketSwapMut.reset();
     };
-    $[98] = approveTxMut;
-    $[99] = buildTxMut;
-    $[100] = marketSwapMut;
-    $[101] = sendSwapTxMut;
-    $[102] = signPermit1Mut;
-    $[103] = t35;
+    $[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 {
-    t35 = $[103];
+    t26 = $[88];
   }
-  const reset = t35;
-  let t36;
-  if ($[104] !== approval || $[105] !== buildTxParams || $[106] !== chainId || $[107] !== marketSwapMut.data || $[108] !== marketSwapMut.error || $[109] !== marketSwapMut.isError || $[110] !== marketSwapMut.isPending || $[111] !== marketSwapMut.isSuccess || $[112] !== marketSwapMut.mutateAsync || $[113] !== reset || $[114] !== signPermit || $[115] !== swap) {
-    t36 = {
+  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: marketSwapMut.mutateAsync,
+      runMarketSwapFlow,
       reset,
       cancelFlow,
+      retryFlow,
       approval,
       signPermit,
       buildTxParams,
@@ -522,55 +497,28 @@ function useMarketFlow(t0) {
       isSuccess: marketSwapMut.isSuccess,
       isError: marketSwapMut.isError,
       error: marketSwapMut.error,
-      result: marketSwapMut.data
+      result: marketSwapMut.data,
+      usedPrice
     };
-    $[104] = approval;
-    $[105] = buildTxParams;
-    $[106] = chainId;
-    $[107] = marketSwapMut.data;
-    $[108] = marketSwapMut.error;
-    $[109] = marketSwapMut.isError;
-    $[110] = marketSwapMut.isPending;
-    $[111] = marketSwapMut.isSuccess;
-    $[112] = marketSwapMut.mutateAsync;
-    $[113] = reset;
-    $[114] = signPermit;
-    $[115] = swap;
-    $[116] = t36;
+    $[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 {
-    t36 = $[116];
+    t27 = $[103];
   }
-  return t36;
-}
-function _temp0(error_4) {
-  console.error("Swap tx error", error_4);
-}
-function _temp9(data_1) {
-  console.log("Swap tx success", data_1);
-}
-function _temp8(error_2) {
-  console.error("Swap tx error", error_2);
-}
-function _temp7() {
-  console.log("Swap tx success");
-}
-function _temp6(error_1) {
-  console.error("Build tx error", error_1);
-}
-function _temp5() {
-  console.log("Build tx success");
-}
-function _temp4(error_0) {
-  console.error("Permit1 error", error_0);
-}
-function _temp3(signature) {
-  console.log("Permit1 signature", signature);
-}
-function _temp2(error) {
-  console.error("Approve tx error", error);
-}
-function _temp() {
-  console.log("Approve tx success");
+  return t27;
 }
 
 export { useMarketFlow };