@velora-dex/widget 0.8.4 → 0.8.5-dev.0

package/dist/hooks/swap/tradeFlow/useTwapFlow.d.ts

@@ -1,4 +1,4 @@
-import { BridgePrice, DeltaPrice } from '@velora-dex/sdk';
+import { DeltaPrice } from '@velora-dex/sdk';
 import { Address, TransactionReceipt } from 'viem';
 import { ApprovalFlowResult, SignPermitFlowResult, SubmitTxResult } from './common/types';
 import { SupportedChainId } from '../../../lib/web3/wagmi/types';
@@ -10,7 +10,7 @@ import { TwapOrderDepositResult } from '../prices/delta/mutations/twap/useDeposi
 import { CancelOrderStepKey } from '../../../components/widget/TradeOverview/steps';
 declare const twapOrderFlowType = "twapOrder";
 export type UseTwapFlowInput = {
-    twapPrice?: DeltaPrice | BridgePrice;
+    twapPrice?: DeltaPrice;
 };
 export type SubmitTwapOrderResult = {
     tradeFlowType: typeof twapOrderFlowType;
@@ -19,7 +19,7 @@ export type SubmitTwapOrderResult = {
         sentOrder: DeltaAuctionWithTwapOrder;
         lastOrderState?: DeltaAuctionWithTwapOrder;
     };
-    twapPrice: DeltaPrice | BridgePrice;
+    twapPrice: DeltaPrice;
     account: Address;
     receiverAddress?: Address;
 };
@@ -82,8 +82,8 @@ export type UseTwapFlowResult = {
     isError: boolean;
     error: Error | null;
     result?: SubmitTwapOrderResult;
-    usedPrice?: DeltaPrice | BridgePrice;
-    freshPrice?: DeltaPrice | BridgePrice;
+    usedPrice?: DeltaPrice;
+    freshPrice?: DeltaPrice;
     submittedTwapOrder?: DeltaAuctionWithTwapOrder;
 };
 export declare function useTwapFlow({ twapPrice: _twapPrice, }: UseTwapFlowInput): UseTwapFlowResult;

package/dist/hooks/swap/tradeFlow/useTwapFlow.d.ts.map

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

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

@@ -1,102 +1,100 @@
 import { useLogger as e } from "../../../core/logger.js";
-import { isBridgePrice as t, useSubscribeToDeltaPrice as n } from "../prices/delta/queries/useDeltaPriceQuery.js";
-import { isETHaddress as r } from "../../../tokens/utils/eth.js";
-import { useTwapSide as i } from "../../../core/twap/state/twapSideAtom.js";
-import { useTwapReceiverAddressValue as a } from "../../../core/twap/state/twapReceiverAddressAtom.js";
-import { HALF_MINUTE_MS as o } from "../../../lib/constants/time.js";
-import { getTwapAmountsFromPrice as s, produceTwapDeadlines as ee } from "../../../lib/utils/twap.js";
-import { useTwapDuration as c, useTwapSlippage as l } from "../../../core/twap/state/twapParamsAtom.js";
-import { useWidgetEvents as u } from "../../../core/state/widgetEventsAtom.js";
-import { getOverallOrderStatus as d, getSwapSideFromDeltaPrice as te } from "../prices/delta/orders/utils.js";
-import { useWatchDeltaAuction as f } from "../prices/delta/queries/useWatchDeltaOrder.js";
-import { amountAfterSlippage as p } from "../../../lib/utils/slippage.js";
-import { useMinViemClient as m } from "../../useMinViemClient.js";
-import { usePartner as h } from "../../usePartner.js";
-import { useTwapPrices as g } from "../prices/useTwapPrices.js";
-import { useEnsureTxReceipt as _ } from "../../txs/queries/useAwaitTx.js";
-import { useCancelOrWithdrawAndCancelDeltaOrder as v } from "../prices/delta/mutations/useCancelOrWithdrawAndCancelDeltaOrder.js";
-import { UserCancelledError as y } from "./common/errors.js";
-import { useMarkPermit1Or2NonceAsUsed as b } from "./common/useSignPermit1Or2.js";
-import { useApproveOrPermit as x } from "./common/useApproveOrPermit.js";
-import { shouldApproveOrBatch as S } from "./common/usePreSignAndSubmitDeltaOrder.js";
-import { useReferrer as C } from "../../useReferrer.js";
-import { useCreateAndSubmitTwapOrder as w } from "../prices/delta/mutations/twap/useCreateTwapOrder.js";
-import { usePreSignAndSubmitTwapOrder as T } from "../prices/delta/mutations/twap/usePreSignAndSubmitTwapOrder.js";
+import { useSubscribeToDeltaPrice as t } from "../prices/delta/queries/useDeltaPriceQuery.js";
+import { isETHaddress as n } from "../../../tokens/utils/eth.js";
+import { useTwapSide as r } from "../../../core/twap/state/twapSideAtom.js";
+import { useTwapReceiverAddressValue as i } from "../../../core/twap/state/twapReceiverAddressAtom.js";
+import { HALF_MINUTE_MS as a } from "../../../lib/constants/time.js";
+import { getTwapAmountsFromPrice as ee, produceTwapDeadlines as o } from "../../../lib/utils/twap.js";
+import { useTwapDuration as s, useTwapSlippage as c } from "../../../core/twap/state/twapParamsAtom.js";
+import { useWidgetEvents as l } from "../../../core/state/widgetEventsAtom.js";
+import { getOverallOrderStatus as u } from "../prices/delta/orders/utils.js";
+import { useWatchDeltaAuction as d } from "../prices/delta/queries/useWatchDeltaOrder.js";
+import { amountAfterSlippage as f } from "../../../lib/utils/slippage.js";
+import { useMinViemClient as p } from "../../useMinViemClient.js";
+import { usePartner as m } from "../../usePartner.js";
+import { useTwapPrices as h } from "../prices/useTwapPrices.js";
+import { useEnsureTxReceipt as g } from "../../txs/queries/useAwaitTx.js";
+import { useCancelOrWithdrawAndCancelDeltaOrder as _ } from "../prices/delta/mutations/useCancelOrWithdrawAndCancelDeltaOrder.js";
+import { UserCancelledError as v } from "./common/errors.js";
+import { useMarkPermit1Or2NonceAsUsed as y } from "./common/useSignPermit1Or2.js";
+import { useApproveOrPermit as b } from "./common/useApproveOrPermit.js";
+import { shouldApproveOrBatch as x } from "./common/usePreSignAndSubmitDeltaOrder.js";
+import { useReferrer as S } from "../../useReferrer.js";
+import { useCreateAndSubmitTwapOrder as C } from "../prices/delta/mutations/twap/useCreateTwapOrder.js";
+import { usePreSignAndSubmitTwapOrder as te } from "../prices/delta/mutations/twap/usePreSignAndSubmitTwapOrder.js";
 import { useDepositAndSubmitTwapOrder as ne } from "../prices/delta/mutations/twap/useDepositAndSubmitTwapOrder.js";
-import { DEFAULT_DELTA_BRIDGE as re } from "../prices/delta/bridge/const.js";
-import { useRef as ie } from "react";
-import { useMutation as ae } from "@tanstack/react-query";
-import { assert as E } from "ts-essentials";
-import "@velora-dex/sdk";
+import { useRef as w } from "react";
+import { useMutation as re } from "@tanstack/react-query";
+import { assert as T } from "ts-essentials";
 import "viem";
-import { useAccount as oe } from "wagmi";
+import { useAccount as ie } from "wagmi";
 //#region src/hooks/swap/tradeFlow/useTwapFlow.ts
-var se = "twapOrder", ce = "runTwapOrderFlow";
-function D({ twapPrice: p }) {
-	let D = e("TwapFlow"), { queryKey: ue, price: de, chainId: O, refetch: fe, totalSrcAmount: pe, side: me, numSlices: k, priceParams: he } = g({ enabled: !1 }), A = de || p, ge = i(), _e = me || ge, { approval: j, signPermit: M, approveTxMut: N, signPermitMut: P, events: F } = x({
-		srcToken: A?.srcToken,
-		srcAmount: pe,
+var ae = "twapOrder", oe = "runTwapOrderFlow";
+function E({ twapPrice: f }) {
+	let E = e("TwapFlow"), { queryKey: ce, price: le, chainId: D, refetch: ue, totalSrcAmount: de, side: fe, numSlices: O, priceParams: pe } = h({ enabled: !1 }), k = le || f, me = r(), he = fe || me, { approval: A, signPermit: j, approveTxMut: M, signPermitMut: N, events: P } = b({
+		srcToken: k?.inputToken.address,
+		srcAmount: de,
 		spenderContractType: "ParaswapDelta",
-		swapSide: _e,
+		swapSide: he,
 		tradeMode: "twap",
-		chainId: O,
+		chainId: D,
 		tryPermit2: !1
-	}), { address: I } = oe(), { minClient: L } = m({
-		chainId: O,
-		account: I
-	}), R = w({
-		chainId: O,
-		account: I,
-		client: L,
+	}), { address: F } = ie(), { minClient: I } = p({
+		chainId: D,
+		account: F
+	}), L = C({
+		chainId: D,
+		account: F,
+		client: I,
 		mutationOptions: {
 			onSuccess: (e) => {
-				D.log("Create Twap Order success", e);
+				E.log("Create Twap Order success", e);
 			},
 			onError: (e) => {
-				D.error("Create Twap Order error", e);
+				E.error("Create Twap Order error", e);
 			}
 		}
-	}), z = {
-		order: R.order,
-		isCreatingOrder: R.isCreatingOrder,
-		isPostingOrder: R.isPostingOrder,
-		isOrderSent: R.isOrderSent,
-		isPending: R.isPending,
-		isError: R.isError,
-		isSuccess: R.isSuccess,
-		error: R.error
-	}, { twapOrderPreSign: B, canBatchTxs: ve, isConnectedToSafe: ye, preSignAndSubmitTwapOrder: be, reset: V } = T({
-		chainId: O,
-		account: I,
-		logger: D,
-		viemClient: L
-	}), { twapOrderDeposit: H, reset: xe, depositAndSubmitTwapOrder: Se } = ne({
-		chainId: O,
-		account: I,
-		logger: D,
-		viemClient: L
+	}), R = {
+		order: L.order,
+		isCreatingOrder: L.isCreatingOrder,
+		isPostingOrder: L.isPostingOrder,
+		isOrderSent: L.isOrderSent,
+		isPending: L.isPending,
+		isError: L.isError,
+		isSuccess: L.isSuccess,
+		error: L.error
+	}, { twapOrderPreSign: z, canBatchTxs: ge, isConnectedToSafe: _e, preSignAndSubmitTwapOrder: ve, reset: B } = te({
+		chainId: D,
+		account: F,
+		logger: E,
+		viemClient: I
+	}), { twapOrderDeposit: V, reset: H, depositAndSubmitTwapOrder: ye } = ne({
+		chainId: D,
+		account: F,
+		logger: E,
+		viemClient: I
 	}), U = {
-		order: z.order || B.order || H.order,
-		isPostingOrder: z.isPostingOrder || B.postingOrder.isPostingOrder || H.postingOrder.isPostingOrder,
-		isCreatingOrder: z.isCreatingOrder || B.isCreatingOrder || H.isCreatingOrder,
-		isOrderSent: z.isOrderSent || B.isOrderSent || H.isOrderSent,
-		isPending: z.isPending || B.isPending || H.isPending,
-		isError: z.isError || B.isError || H.isError,
-		isSuccess: z.isSuccess || B.isSuccess || H.isSuccess,
-		error: z.error || B.error || H.error
-	}, W = f({
+		order: R.order || z.order || V.order,
+		isPostingOrder: R.isPostingOrder || z.postingOrder.isPostingOrder || V.postingOrder.isPostingOrder,
+		isCreatingOrder: R.isCreatingOrder || z.isCreatingOrder || V.isCreatingOrder,
+		isOrderSent: R.isOrderSent || z.isOrderSent || V.isOrderSent,
+		isPending: R.isPending || z.isPending || V.isPending,
+		isError: R.isError || z.isError || V.isError,
+		isSuccess: R.isSuccess || z.isSuccess || V.isSuccess,
+		error: R.error || z.error || V.error
+	}, W = d({
 		orderId: U.order?.id,
-		refetchInterval: o,
+		refetchInterval: a,
 		onAuctionSuccess: (e) => {
-			D.log("Twap Order success", e);
+			E.log("Twap Order success", e);
 		},
 		onAuctionFailure: (e) => {
-			D.log("Twap Order failure", e);
+			E.log("Twap Order failure", e);
 		},
 		onUpdatedAuction: (e) => {
-			D.log("Twap Order updated", e);
+			E.log("Twap Order updated", e);
 		}
-	}), G = W.data ? d(W.data) : null, K = {
+	}), G = W.data ? u(W.data) : null, K = {
 		sentOrder: U.order,
 		lastOrderState: W.data,
 		isOrderPending: G === "pending",
@@ -106,14 +104,14 @@ function D({ twapPrice: p }) {
 		isError: W.isError || G === "failed",
 		isSuccess: G === "confirmed",
 		error: W.error
-	}, q = K.lastOrderState || K.sentOrder, J = v({
+	}, q = K.lastOrderState || K.sentOrder, J = _({
 		order: q,
-		chainId: O,
-		account: I,
-		client: L,
-		logger: D,
-		mutationOptions: { onMutate: () => (E(q, "No order to cancel"), q) }
-	}), Ce = {
+		chainId: D,
+		account: F,
+		client: I,
+		logger: E,
+		mutationOptions: { onMutate: () => (T(q, "No order to cancel"), q) }
+	}), be = {
 		receipt: J.receipt,
 		txHash: J.txHash,
 		response: J.cancelOrderResponse,
@@ -126,208 +124,198 @@ function D({ twapPrice: p }) {
 		error: J.error,
 		result: J.result,
 		step: J.step
-	}, we = _(), Y = ie(null), X = ie(null), Te = () => {
-		Y.current?.abort(new y()), Y.current = null, X.current = null;
-	}, Ee = a(), { markNonceAsUsed: De, clearNonce: Oe } = b({ chainId: O }), { partner: ke, partnerAddress: Ae, partnerFeeBps: je, partnerTakesSurplus: Me } = h(), { referrerAddress: Ne } = C(), Pe = n(), { onTwapOrder: Z } = u(), Fe = l(), Ie = c(), Le = async ({ onTxSent: e, lastPrice: n } = {}) => {
-		N.reset(), P.reset(), R.reset(), J.reset(), V(), xe(), E(A, "Twap price is not available");
-		let i = new AbortController();
-		Y.current = i;
-		let a = i.signal, { orderDeadline: o, orderInterval: c } = ee({
-			durationMin: Ie,
-			numSlices: k
-		}), l = Math.floor(Fe * 100), u, d, f, p = j.allowanceToSet, m = M.amountToPermit, h = A;
-		if (h.hmac === n?.hmac) {
-			let e = await fe({ cancelRefetch: !1 });
-			a.throwIfAborted(), e.data && (h = e.data);
+	}, xe = g(), Y = w(null), X = w(null), Se = () => {
+		Y.current?.abort(new v()), Y.current = null, X.current = null;
+	}, Ce = i(), { markNonceAsUsed: we, clearNonce: Te } = y({ chainId: D }), { partner: Ee, partnerAddress: De, partnerFeeBps: Oe, partnerTakesSurplus: ke } = m(), { referrerAddress: Ae } = S(), je = t(), { onTwapOrder: Z } = l(), Me = c(), Ne = s(), Pe = async ({ onTxSent: e, lastPrice: t } = {}) => {
+		M.reset(), N.reset(), L.reset(), J.reset(), B(), H(), T(k, "Twap price is not available");
+		let r = new AbortController();
+		Y.current = r;
+		let i = r.signal, { orderDeadline: a, orderInterval: s } = o({
+			durationMin: Ne,
+			numSlices: O
+		}), c = Math.floor(Me * 100), l, u, d, f = A.allowanceToSet, p = j.amountToPermit, m = k;
+		if (m.id === t?.id) {
+			let e = await ue({ cancelRefetch: !1 });
+			i.throwIfAborted(), e.data && (m = e.data);
 		}
-		let g;
-		X.current = h;
-		let _ = r(h.srcToken), { shouldDoApprovalTxOrPermit: v, tryPermit: y, shouldPreSignBatch: b } = S({
-			approval: j,
-			signPermit: M,
-			canBatchTxs: ve,
-			isConnectedToSafe: ye
+		let h;
+		X.current = m;
+		let g = n(m.inputToken.address), { shouldDoApprovalTxOrPermit: _, tryPermit: v, shouldPreSignBatch: y } = x({
+			approval: A,
+			signPermit: j,
+			canBatchTxs: ge,
+			isConnectedToSafe: _e
 		});
 		try {
-			if (v && p) {
-				let t = ue;
+			if (_ && f) {
+				let t = ce;
 				if (t) {
-					let e = p;
-					g = Pe({
+					let e = f;
+					h = je({
 						queryKey: t,
 						onData: (t) => {
 							let n = t;
-							if (a.aborted) {
-								g?.(), g = void 0;
+							if (i.aborted) {
+								h?.(), h = void 0;
 								return;
 							}
-							let { srcAmount: r } = s({
+							let { srcAmount: r } = ee({
 								price: n,
-								numSlices: k
+								numSlices: O
 							});
-							e >= BigInt(r) && (D.log("~ fresh price ~", n), h = n, X.current = h);
+							e >= BigInt(r) && (E.log("~ fresh price ~", n), m = n, X.current = m);
 						}
 					});
 				}
 				try {
-					if (y) F.onSignPermit.request({ allowanceToSet: m }), u = await P.signPermitAsync({
-						deadline: BigInt(o),
-						value: m
-					}), F.onSignPermit.confirmed({
-						allowanceToSet: m,
-						permit: u?.permitEncodedArgs
+					if (v) P.onSignPermit.request({ allowanceToSet: p }), l = await N.signPermitAsync({
+						deadline: BigInt(a),
+						value: p
+					}), P.onSignPermit.confirmed({
+						allowanceToSet: p,
+						permit: l?.permitEncodedArgs
 					});
 					else {
-						F.onApproveTx.request({ allowanceToSet: p }), d = await N.approveAsync({ allowanceData: { allowanceToSet: p } }), F.onApproveTx.sent({
-							allowanceToSet: p,
-							txHash: d
-						}), a.throwIfAborted();
-						let t = we({
-							hash: d,
-							chainId: O,
+						P.onApproveTx.request({ allowanceToSet: f }), u = await M.approveAsync({ allowanceData: { allowanceToSet: f } }), P.onApproveTx.sent({
+							allowanceToSet: f,
+							txHash: u
+						}), i.throwIfAborted();
+						let t = xe({
+							hash: u,
+							chainId: D,
 							onReplaced: (e) => {
-								D.log("onReplaced:approveTx", d, e);
+								E.log("onReplaced:approveTx", u, e);
 							}
 						});
 						e && e({
-							chainId: O,
+							chainId: D,
 							action: "approve",
-							transactionHash: d,
+							transactionHash: u,
 							receiptPromise: t,
 							transactionSpecificData: {
 								action: "approve",
-								approvedAmount: p,
-								tokenAddress: j.token,
-								spenderAddress: j.spender
+								approvedAmount: f,
+								tokenAddress: A.token,
+								spenderAddress: A.spender
 							}
-						}), f = await t, F.onApproveTx.confirmed({
-							allowanceToSet: p,
-							txHash: d,
-							txReceipt: f
-						}), D.log("~ approveTx ~ receipt:", f);
+						}), d = await t, P.onApproveTx.confirmed({
+							allowanceToSet: f,
+							txHash: u,
+							txReceipt: d
+						}), E.log("~ approveTx ~ receipt:", d);
 					}
 				} catch (e) {
-					throw y ? F.onSignPermit.failed({
-						allowanceToSet: m,
-						error: e
-					}) : F.onApproveTx.failed({
+					throw v ? P.onSignPermit.failed({
 						allowanceToSet: p,
+						error: e
+					}) : P.onApproveTx.failed({
+						allowanceToSet: f,
 						error: e,
-						txHash: d
+						txHash: u
 					}), e;
 				}
 			}
-			a.throwIfAborted(), E(I, "Account is not connected");
-			let n = h;
-			X.current = n, g?.(), g = void 0, E(n, "Twap price is not available");
-			let r = te(n), { srcAmount: i, destAmount: ee } = s({
-				price: n,
-				numSlices: k
-			}), x = u?.permitEncodedArgs, S = t(n) ? n.bridge.destinationChainId : O;
+			i.throwIfAborted(), T(F, "Account is not connected");
+			let t = m;
+			X.current = t, h?.(), h = void 0, T(t, "Twap price is not available");
+			let n = t.side, { srcAmount: r, destAmount: o } = ee({
+				price: t,
+				numSlices: O
+			}), b = l?.permitEncodedArgs;
 			Z?.({ event: {
 				name: "TwapOrder:request",
-				params: { price: n }
+				params: { price: t }
 			} });
-			let C, w;
-			w = r === "SELL" ? {
+			let x, S;
+			S = n === "SELL" ? {
 				onChainOrderType: "TWAPOrder",
-				totalSrcAmount: i
+				totalSrcAmount: r
 			} : {
 				onChainOrderType: "TWAPBuyOrder",
-				totalDestAmount: ee,
-				maxSrcAmount: i
+				totalDestAmount: o,
+				maxSrcAmount: r
 			};
-			let T = {
-				signal: a,
+			let C = {
+				signal: i,
 				type: "MARKET",
-				degenMode: he.degenMode,
-				referrerAddress: Ne,
+				degenMode: pe.degenMode,
+				referrerAddress: Ae,
 				orderInput: {
-					owner: I,
-					beneficiary: Ee,
-					srcToken: n.srcToken,
-					destToken: n.destToken,
-					permit: x,
-					destChainId: S,
-					deltaPrice: {
-						...n,
-						bridge: {
-							...n.bridge,
-							protocolSelector: re.protocolSelector
-						},
-						partner: ke
-					},
-					partner: ke,
-					partnerAddress: Ae,
-					partnerFeeBps: je,
-					partnerTakesSurplus: Me,
-					deadline: o,
-					...w,
-					numSlices: k,
-					slippage: l,
-					interval: c
+					owner: F,
+					beneficiary: Ce,
+					permit: b,
+					route: t.route,
+					partner: Ee,
+					partnerAddress: De,
+					partnerFeeBps: Oe,
+					partnerTakesSurplus: ke,
+					deadline: a,
+					...S,
+					numSlices: O,
+					slippage: c,
+					interval: s
 				}
 			};
-			return C = _ ? await Se({
-				createOrderInput: T,
-				depositAmount: le(w, Fe),
+			return x = g ? await ye({
+				createOrderInput: C,
+				depositAmount: se(S, Me),
 				onTxSent: e
-			}) : b ? await be({
-				createOrderInput: T,
-				approval: j,
+			}) : y ? await ve({
+				createOrderInput: C,
+				approval: A,
 				onTxSent: e
-			}) : await R.mutateAsync(T), u && De(u.signedPermitData), Z?.({ event: {
+			}) : await L.mutateAsync(C), l && we(l.signedPermitData), Z?.({ event: {
 				name: "TwapOrder:sent",
 				params: {
-					price: n,
-					order: C
+					price: t,
+					order: x
 				}
 			} }), {
-				tradeFlowType: se,
+				tradeFlowType: ae,
 				approve: {
-					txHash: d,
-					receipt: f
+					txHash: u,
+					receipt: d
 				},
-				twapOrder: { sentOrder: C },
-				twapPrice: n,
-				account: I,
-				receiverAddress: Ee
+				twapOrder: { sentOrder: x },
+				twapPrice: t,
+				account: F,
+				receiverAddress: Ce
 			};
 		} catch (e) {
-			throw u && Oe(u.signedPermitData), Z?.({ event: {
+			throw l && Te(l.signedPermitData), Z?.({ event: {
 				name: "TwapOrder:failed",
 				params: { error: e }
 			} }), e;
 		} finally {
-			g?.();
+			h?.();
 		}
-	}, Re = async () => {
+	}, Fe = async () => {
 		try {
 			return await J.cancelDeltaOrder();
 		} catch (e) {
-			D.error("Cancel Delta order error", e), J.reset();
+			E.error("Cancel Delta order error", e), J.reset();
 		}
-	}, Q = ae({
-		mutationFn: Le,
-		mutationKey: [ce],
+	}, Q = re({
+		mutationFn: Pe,
+		mutationKey: [oe],
 		onSuccess: (e) => {
-			D.log("Twap Order success", e);
+			E.log("Twap Order success", e);
 		},
 		onError: (e) => {
-			D.error("Twap Order error", e);
+			E.error("Twap Order error", e);
 		},
 		onSettled: () => {
-			D.log("Twap Order settled");
+			E.log("Twap Order settled");
 		}
-	}), ze = Q.mutateAsync, Be = () => {
-		X.current = null, N.reset(), P.reset(), R.reset(), Q.reset(), J.reset(), V(), xe();
-	}, Ve = (e) => {
+	}), Ie = Q.mutateAsync, Le = () => {
+		X.current = null, M.reset(), N.reset(), L.reset(), Q.reset(), J.reset(), B(), H();
+	}, Re = (e) => {
 		let t = X.current;
-		return Be(), ze({
+		return Le(), Ie({
 			...e,
 			lastPrice: t
 		});
-	}, He = X.current || A, $ = Q.data;
+	}, ze = X.current || k, $ = Q.data;
 	$ && K.lastOrderState && ($ = {
 		...$,
 		twapOrder: {
@@ -335,36 +323,36 @@ function D({ twapPrice: p }) {
 			lastOrderState: K.lastOrderState
 		}
 	});
-	let Ue = $?.twapOrder.sentOrder || K.lastOrderState || K.sentOrder;
+	let Be = $?.twapOrder.sentOrder || K.lastOrderState || K.sentOrder;
 	return {
-		tradeFlowType: se,
-		chainId: O,
-		runTwapOrderFlow: ze,
-		reset: Be,
-		cancelFlow: Te,
-		retryFlow: Ve,
-		cancelTwapOrder: Re,
-		approval: j,
-		signPermit: M,
-		twapOrderPreSign: B,
-		twapOrderDeposit: H,
+		tradeFlowType: ae,
+		chainId: D,
+		runTwapOrderFlow: Ie,
+		reset: Le,
+		cancelFlow: Se,
+		retryFlow: Re,
+		cancelTwapOrder: Fe,
+		approval: A,
+		signPermit: j,
+		twapOrderPreSign: z,
+		twapOrderDeposit: V,
 		twapOrderSubmission: U,
 		twapOrderExecution: K,
-		twapOrderCancelation: Ce,
+		twapOrderCancelation: be,
 		isPending: Q.isPending,
 		isSuccess: U.isSuccess && K.isSuccess,
 		isError: Q.isError,
 		error: Q.error,
 		result: $,
-		usedPrice: He,
-		freshPrice: A,
-		submittedTwapOrder: Ue
+		usedPrice: ze,
+		freshPrice: k,
+		submittedTwapOrder: Be
 	};
 }
-function le(e, t) {
-	return "totalSrcAmount" in e ? e.totalSrcAmount : p(e.maxSrcAmount, t, "BUY").toFixed(0);
+function se(e, t) {
+	return "totalSrcAmount" in e ? e.totalSrcAmount : f(e.maxSrcAmount, t, "BUY").toFixed(0);
 }
 //#endregion
-export { D as useTwapFlow };
+export { E as useTwapFlow };
 
 //# sourceMappingURL=useTwapFlow.js.map