@velora-dex/widget 0.4.14-dev.4 → 0.5.0

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

@@ -1,5 +1,5 @@
-import { GenericStep, LimitOrderStep, LimitOrderStepKey } from '../../../components/widget/TradeOverview/steps';
-import { SubmitLimitOrderResult, UseLimitOrderFlowInput, UseLimitOrderFlowResult } from './useLimitOrderFlow';
+import { CancelOrderStepKey, LimitOrderStep, LimitOrderStepKey } from '../../../components/widget/TradeOverview/steps';
+import { UseLimitOrderFlowInput, UseLimitOrderFlowResult } from './useLimitOrderFlow';
 type UseLimitOrderStepResult = {
     startLimitOrder: UseLimitOrderFlowResult["runLimitOrderFlow"];
     cancelLimitOrder: UseLimitOrderFlowResult["cancelLimitOrder"];
@@ -9,11 +9,11 @@ type UseLimitOrderStepResult = {
     isFlowCancellable: boolean;
     isOrderCancellable: boolean;
     step?: LimitOrderStep;
-    orderCancellationStep?: GenericStep;
+    orderCancellationStep?: CancelOrderStepKey;
     explorerLink?: string;
     error: Error | null;
     erroredStep?: LimitOrderStepKey;
-    result?: SubmitLimitOrderResult;
+    result?: UseLimitOrderFlowResult["result"];
     tradeFlowType: UseLimitOrderFlowResult["tradeFlowType"];
 };
 export declare function useLimitOrderStep(options: UseLimitOrderFlowInput): UseLimitOrderStepResult;

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

@@ -1 +1 @@
-{"version":3,"file":"useLimitOrderStep.d.ts","sourceRoot":"","sources":["../../../../src/hooks/swap/tradeFlow/useLimitOrderStep.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAK7B,KAAK,uBAAuB,GAAG;IAC7B,eAAe,EAAE,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;IAC9D,gBAAgB,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE9D,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACxC,UAAU,EAAE,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAClD,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAChD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,aAAa,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,GAC9B,uBAAuB,CA6GzB"}
+{"version":3,"file":"useLimitOrderStep.d.ts","sourceRoot":"","sources":["../../../../src/hooks/swap/tradeFlow/useLimitOrderStep.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAK7B,KAAK,uBAAuB,GAAG;IAC7B,eAAe,EAAE,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;IAC9D,gBAAgB,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE9D,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACxC,UAAU,EAAE,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAClD,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAChD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,MAAM,CAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC3C,aAAa,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,GAC9B,uBAAuB,CAoGzB"}

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

@@ -5,7 +5,7 @@ import { constructExplorerOrderDetailsLink } from '../../../lib/utils/explorer.j
 import { isUserCancelledError } from './common/errors.js';
 
 function useLimitOrderStep(options) {
-  const $ = distExports.c(24);
+  const $ = distExports.c(23);
   const logger = useLogger("LimitOrderStep");
   const limitOrderFlow = useLimitOrderFlow(options);
   const startLimitOrder = limitOrderFlow.runLimitOrderFlow;
@@ -15,7 +15,6 @@ function useLimitOrderStep(options) {
   let explorerLink;
   let isFlowCancellable;
   let isOrderCancellable;
-  let orderCancellationStep;
   let step;
   if ($[0] !== limitOrderFlow || $[1] !== logger.once) {
     const approvalHappeningOrNeverHappened = limitOrderFlow.approval.isPending || !limitOrderFlow.approval.isSuccess;
@@ -40,17 +39,6 @@ function useLimitOrderStep(options) {
         }
       }
     }
-    if (limitOrderFlow.limitOrderCancelation.isCancelingOrder) {
-      orderCancellationStep = "pending";
-    } else {
-      if (limitOrderFlow.limitOrderCancelation.isOrderCanceled) {
-        orderCancellationStep = "success";
-      } else {
-        if (limitOrderFlow.limitOrderCancelation.isError) {
-          orderCancellationStep = "error";
-        }
-      }
-    }
     const approvalIsStarted = step?.key === "signature" && step.subStep === "approval-signature" && limitOrderFlow.approval.isTxPending;
     const isOrderBeingSigned = step?.key === "signature" && (step.subStep === "order-signature" || step.subStep === "standalone-order-signature");
     const isPostingOrder = limitOrderFlow.limitOrderSubmission.isPostingOrder;
@@ -68,22 +56,20 @@ function useLimitOrderStep(options) {
     $[2] = explorerLink;
     $[3] = isFlowCancellable;
     $[4] = isOrderCancellable;
-    $[5] = orderCancellationStep;
-    $[6] = step;
+    $[5] = step;
   } else {
     explorerLink = $[2];
     isFlowCancellable = $[3];
     isOrderCancellable = $[4];
-    orderCancellationStep = $[5];
-    step = $[6];
+    step = $[5];
   }
   let t0;
-  if ($[7] !== limitOrderFlow.error) {
+  if ($[6] !== limitOrderFlow.error) {
     t0 = isUserCancelledError(limitOrderFlow.error) ? null : limitOrderFlow.error;
-    $[7] = limitOrderFlow.error;
-    $[8] = t0;
+    $[6] = limitOrderFlow.error;
+    $[7] = t0;
   } else {
-    t0 = $[8];
+    t0 = $[7];
   }
   const error = t0;
   let erroredStep;
@@ -97,7 +83,7 @@ function useLimitOrderStep(options) {
     }
   }
   let t1;
-  if ($[9] !== cancelFlow || $[10] !== error || $[11] !== erroredStep || $[12] !== explorerLink || $[13] !== isFlowCancellable || $[14] !== isOrderCancellable || $[15] !== limitOrderFlow.cancelLimitOrder || $[16] !== limitOrderFlow.result || $[17] !== limitOrderFlow.tradeFlowType || $[18] !== orderCancellationStep || $[19] !== reset || $[20] !== retryFlow || $[21] !== startLimitOrder || $[22] !== step) {
+  if ($[8] !== cancelFlow || $[9] !== error || $[10] !== erroredStep || $[11] !== explorerLink || $[12] !== isFlowCancellable || $[13] !== isOrderCancellable || $[14] !== limitOrderFlow.cancelLimitOrder || $[15] !== limitOrderFlow.limitOrderCancelation.step || $[16] !== limitOrderFlow.result || $[17] !== limitOrderFlow.tradeFlowType || $[18] !== reset || $[19] !== retryFlow || $[20] !== startLimitOrder || $[21] !== step) {
     t1 = {
       startLimitOrder,
       cancelLimitOrder: limitOrderFlow.cancelLimitOrder,
@@ -107,30 +93,30 @@ function useLimitOrderStep(options) {
       isFlowCancellable,
       isOrderCancellable,
       step,
-      orderCancellationStep,
+      orderCancellationStep: limitOrderFlow.limitOrderCancelation.step,
       explorerLink,
       error,
       erroredStep,
       result: limitOrderFlow.result,
       tradeFlowType: limitOrderFlow.tradeFlowType
     };
-    $[9] = cancelFlow;
-    $[10] = error;
-    $[11] = erroredStep;
-    $[12] = explorerLink;
-    $[13] = isFlowCancellable;
-    $[14] = isOrderCancellable;
-    $[15] = limitOrderFlow.cancelLimitOrder;
+    $[8] = cancelFlow;
+    $[9] = error;
+    $[10] = erroredStep;
+    $[11] = explorerLink;
+    $[12] = isFlowCancellable;
+    $[13] = isOrderCancellable;
+    $[14] = limitOrderFlow.cancelLimitOrder;
+    $[15] = limitOrderFlow.limitOrderCancelation.step;
     $[16] = limitOrderFlow.result;
     $[17] = limitOrderFlow.tradeFlowType;
-    $[18] = orderCancellationStep;
-    $[19] = reset;
-    $[20] = retryFlow;
-    $[21] = startLimitOrder;
-    $[22] = step;
-    $[23] = t1;
+    $[18] = reset;
+    $[19] = retryFlow;
+    $[20] = startLimitOrder;
+    $[21] = step;
+    $[22] = t1;
   } else {
-    t1 = $[23];
+    t1 = $[22];
   }
   return t1;
 }

package/dist/hooks/swap/tradeFlow/useLimitOrderStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLimitOrderStep.js","sources":["../../../../src/hooks/swap/tradeFlow/useLimitOrderStep.ts"],"sourcesContent":["import type {\n  GenericStep,\n  LimitOrderStep,\n  LimitOrderStepKey,\n} from \"@/components/widget/TradeOverview/steps\";\nimport {\n  useLimitOrderFlow,\n  type SubmitLimitOrderResult,\n  type UseLimitOrderFlowInput,\n  type UseLimitOrderFlowResult,\n} from \"./useLimitOrderFlow\";\nimport { useLogger } from \"@/core/logger\";\nimport { constructExplorerOrderDetailsLink } from \"@/lib/utils/explorer\";\nimport { isUserCancelledError } from \"./common/errors\";\n\ntype UseLimitOrderStepResult = {\n  startLimitOrder: UseLimitOrderFlowResult[\"runLimitOrderFlow\"];\n  cancelLimitOrder: UseLimitOrderFlowResult[\"cancelLimitOrder\"];\n  // @TODO check if resetting is necessary on error, maybe not if submit on click works as a reset\n  reset: UseLimitOrderFlowResult[\"reset\"];\n  cancelFlow: UseLimitOrderFlowResult[\"cancelFlow\"];\n  retryFlow: UseLimitOrderFlowResult[\"retryFlow\"];\n  isFlowCancellable: boolean;\n  isOrderCancellable: boolean;\n  step?: LimitOrderStep;\n  orderCancellationStep?: GenericStep;\n  explorerLink?: string;\n  error: Error | null;\n  erroredStep?: LimitOrderStepKey;\n  result?: SubmitLimitOrderResult;\n  tradeFlowType: UseLimitOrderFlowResult[\"tradeFlowType\"];\n};\n\nexport function useLimitOrderStep(\n  options: UseLimitOrderFlowInput\n): UseLimitOrderStepResult {\n  const logger = useLogger(\"LimitOrderStep\");\n  const limitOrderFlow = useLimitOrderFlow(options);\n\n  const startLimitOrder = limitOrderFlow.runLimitOrderFlow;\n  const reset = limitOrderFlow.reset;\n  const cancelFlow = limitOrderFlow.cancelFlow;\n  const retryFlow = limitOrderFlow.retryFlow;\n\n  let step: LimitOrderStep | undefined;\n\n  const approvalHappeningOrNeverHappened =\n    // isPending starts as false,\n    // needsApproval && !isSuccess allows to detect approve step right away even then\n    limitOrderFlow.approval.isPending || !limitOrderFlow.approval.isSuccess;\n\n  if (\n    limitOrderFlow.approval.needsApproval &&\n    approvalHappeningOrNeverHappened\n  ) {\n    step = { key: \"signature\", subStep: \"approval-signature\" };\n  } else if (limitOrderFlow.limitOrderSubmission.isPending) {\n    const approvalHappened = !!limitOrderFlow.approval.txHash;\n\n    step = {\n      key: \"signature\",\n      subStep: approvalHappened\n        ? \"order-signature\"\n        : \"standalone-order-signature\",\n    };\n  } else if (limitOrderFlow.isPending) {\n    // if something is between steps but not clear step,\n    // then assume we're at the standalone signature sub-step\n    step = { key: \"signature\", subStep: \"standalone-order-signature\" };\n  }\n\n  let orderCancellationStep: GenericStep | undefined;\n  if (limitOrderFlow.limitOrderCancelation.isCancelingOrder) {\n    orderCancellationStep = \"pending\";\n  } else if (limitOrderFlow.limitOrderCancelation.isOrderCanceled) {\n    orderCancellationStep = \"success\";\n  } else if (limitOrderFlow.limitOrderCancelation.isError) {\n    orderCancellationStep = \"error\";\n  }\n\n  const approvalIsStarted =\n    step?.key === \"signature\" &&\n    step.subStep === \"approval-signature\" &&\n    limitOrderFlow.approval.isTxPending;\n\n  const isOrderBeingSigned =\n    step?.key === \"signature\" &&\n    (step.subStep === \"order-signature\" ||\n      step.subStep === \"standalone-order-signature\");\n\n  const isPostingOrder = limitOrderFlow.limitOrderSubmission.isPostingOrder;\n\n  const isFlowCancellable =\n    // final Order is not yet submitted, there's something to cancel;\n    // but some steps are already started so we can't simply dismiss\n    (approvalIsStarted || isOrderBeingSigned) && !isPostingOrder;\n\n  const isOrderCancellable =\n    limitOrderFlow.limitOrderCancelation.isOrderCancellable;\n\n  const orderId = limitOrderFlow.limitOrderSubmission.order?.id;\n  const explorerLink = orderId\n    ? constructExplorerOrderDetailsLink(orderId)\n    : undefined;\n\n  logger.once.log(\"step\", step, limitOrderFlow, {\n    isFlowCancellable,\n    explorerLink,\n    orderId,\n  });\n\n  // intentional cancellation is handled separately\n  const error = isUserCancelledError(limitOrderFlow.error)\n    ? null\n    : limitOrderFlow.error;\n\n  let erroredStep: LimitOrderStepKey | undefined;\n\n  if (limitOrderFlow.isError) {\n    if (limitOrderFlow.approval.isError) {\n      erroredStep = \"signature\";\n    } else if (limitOrderFlow.limitOrderSubmission.isError) {\n      erroredStep = \"order-submission\";\n    }\n  }\n\n  return {\n    startLimitOrder,\n    cancelLimitOrder: limitOrderFlow.cancelLimitOrder,\n    reset, // @TODO it maybe makes sense to reset mutation data when TradeOverflow drawer is closed\n    // if we ever depend on mutation.result when Drawer is not closed,\n    // otherwise the result sticks around until remount or next mutation start\n    cancelFlow,\n    retryFlow,\n    isFlowCancellable,\n    isOrderCancellable,\n    step,\n    orderCancellationStep,\n    explorerLink,\n    error,\n    erroredStep,\n    result: limitOrderFlow.result,\n    tradeFlowType: limitOrderFlow.tradeFlowType,\n  };\n}\n"],"names":["useLimitOrderStep","options","$","_c","logger","useLogger","limitOrderFlow","useLimitOrderFlow","startLimitOrder","runLimitOrderFlow","reset","cancelFlow","retryFlow","explorerLink","isFlowCancellable","isOrderCancellable","orderCancellationStep","step","once","approvalHappeningOrNeverHappened","approval","isPending","isSuccess","needsApproval","limitOrderSubmission","approvalHappened","txHash","limitOrderCancelation","isCancelingOrder","isOrderCanceled","isError","approvalIsStarted","key","subStep","isTxPending","isOrderBeingSigned","isPostingOrder","orderId","order","id","constructExplorerOrderDetailsLink","undefined","log","t0","error","isUserCancelledError","erroredStep","t1","cancelLimitOrder","result","tradeFlowType"],"mappings":"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"}
+{"version":3,"file":"useLimitOrderStep.js","sources":["../../../../src/hooks/swap/tradeFlow/useLimitOrderStep.ts"],"sourcesContent":["import type {\n  CancelOrderStepKey,\n  LimitOrderStep,\n  LimitOrderStepKey,\n} from \"@/components/widget/TradeOverview/steps\";\nimport {\n  useLimitOrderFlow,\n  type UseLimitOrderFlowInput,\n  type UseLimitOrderFlowResult,\n} from \"./useLimitOrderFlow\";\nimport { useLogger } from \"@/core/logger\";\nimport { constructExplorerOrderDetailsLink } from \"@/lib/utils/explorer\";\nimport { isUserCancelledError } from \"./common/errors\";\n\ntype UseLimitOrderStepResult = {\n  startLimitOrder: UseLimitOrderFlowResult[\"runLimitOrderFlow\"];\n  cancelLimitOrder: UseLimitOrderFlowResult[\"cancelLimitOrder\"];\n  // @TODO check if resetting is necessary on error, maybe not if submit on click works as a reset\n  reset: UseLimitOrderFlowResult[\"reset\"];\n  cancelFlow: UseLimitOrderFlowResult[\"cancelFlow\"];\n  retryFlow: UseLimitOrderFlowResult[\"retryFlow\"];\n  isFlowCancellable: boolean;\n  isOrderCancellable: boolean;\n  step?: LimitOrderStep;\n  orderCancellationStep?: CancelOrderStepKey;\n  explorerLink?: string;\n  error: Error | null;\n  erroredStep?: LimitOrderStepKey;\n  result?: UseLimitOrderFlowResult[\"result\"];\n  tradeFlowType: UseLimitOrderFlowResult[\"tradeFlowType\"];\n};\n\nexport function useLimitOrderStep(\n  options: UseLimitOrderFlowInput\n): UseLimitOrderStepResult {\n  const logger = useLogger(\"LimitOrderStep\");\n  const limitOrderFlow = useLimitOrderFlow(options);\n\n  const startLimitOrder = limitOrderFlow.runLimitOrderFlow;\n  const reset = limitOrderFlow.reset;\n  const cancelFlow = limitOrderFlow.cancelFlow;\n  const retryFlow = limitOrderFlow.retryFlow;\n\n  let step: LimitOrderStep | undefined;\n\n  const approvalHappeningOrNeverHappened =\n    // isPending starts as false,\n    // needsApproval && !isSuccess allows to detect approve step right away even then\n    limitOrderFlow.approval.isPending || !limitOrderFlow.approval.isSuccess;\n\n  if (\n    limitOrderFlow.approval.needsApproval &&\n    approvalHappeningOrNeverHappened\n  ) {\n    step = { key: \"signature\", subStep: \"approval-signature\" };\n  } else if (limitOrderFlow.limitOrderSubmission.isPending) {\n    const approvalHappened = !!limitOrderFlow.approval.txHash;\n\n    step = {\n      key: \"signature\",\n      subStep: approvalHappened\n        ? \"order-signature\"\n        : \"standalone-order-signature\",\n    };\n  } else if (limitOrderFlow.isPending) {\n    // if something is between steps but not clear step,\n    // then assume we're at the standalone signature sub-step\n    step = { key: \"signature\", subStep: \"standalone-order-signature\" };\n  }\n\n  const approvalIsStarted =\n    step?.key === \"signature\" &&\n    step.subStep === \"approval-signature\" &&\n    limitOrderFlow.approval.isTxPending;\n\n  const isOrderBeingSigned =\n    step?.key === \"signature\" &&\n    (step.subStep === \"order-signature\" ||\n      step.subStep === \"standalone-order-signature\");\n\n  const isPostingOrder = limitOrderFlow.limitOrderSubmission.isPostingOrder;\n\n  const isFlowCancellable =\n    // final Order is not yet submitted, there's something to cancel;\n    // but some steps are already started so we can't simply dismiss\n    (approvalIsStarted || isOrderBeingSigned) && !isPostingOrder;\n\n  const isOrderCancellable =\n    limitOrderFlow.limitOrderCancelation.isOrderCancellable;\n\n  const orderId = limitOrderFlow.limitOrderSubmission.order?.id;\n  const explorerLink = orderId\n    ? constructExplorerOrderDetailsLink(orderId)\n    : undefined;\n\n  logger.once.log(\"step\", step, limitOrderFlow, {\n    isFlowCancellable,\n    explorerLink,\n    orderId,\n  });\n\n  // intentional cancellation is handled separately\n  const error = isUserCancelledError(limitOrderFlow.error)\n    ? null\n    : limitOrderFlow.error;\n\n  let erroredStep: LimitOrderStepKey | undefined;\n\n  if (limitOrderFlow.isError) {\n    if (limitOrderFlow.approval.isError) {\n      erroredStep = \"signature\";\n    } else if (limitOrderFlow.limitOrderSubmission.isError) {\n      erroredStep = \"order-submission\";\n    }\n  }\n\n  return {\n    startLimitOrder,\n    cancelLimitOrder: limitOrderFlow.cancelLimitOrder,\n    reset, // @TODO it maybe makes sense to reset mutation data when TradeOverflow drawer is closed\n    // if we ever depend on mutation.result when Drawer is not closed,\n    // otherwise the result sticks around until remount or next mutation start\n    cancelFlow,\n    retryFlow,\n    isFlowCancellable,\n    isOrderCancellable,\n    step,\n    orderCancellationStep: limitOrderFlow.limitOrderCancelation.step,\n    explorerLink,\n    error,\n    erroredStep,\n    result: limitOrderFlow.result,\n    tradeFlowType: limitOrderFlow.tradeFlowType,\n  };\n}\n"],"names":["useLimitOrderStep","options","$","_c","logger","useLogger","limitOrderFlow","useLimitOrderFlow","startLimitOrder","runLimitOrderFlow","reset","cancelFlow","retryFlow","explorerLink","isFlowCancellable","isOrderCancellable","step","once","approvalHappeningOrNeverHappened","approval","isPending","isSuccess","needsApproval","limitOrderSubmission","approvalHappened","txHash","approvalIsStarted","key","subStep","isTxPending","isOrderBeingSigned","isPostingOrder","limitOrderCancelation","orderId","order","id","constructExplorerOrderDetailsLink","undefined","log","t0","error","isUserCancelledError","erroredStep","isError","t1","cancelLimitOrder","result","tradeFlowType","orderCancellationStep"],"mappings":"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"}

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

@@ -4,7 +4,8 @@ import { Address, Hash, TransactionReceipt } from 'viem';
 import { ApprovalFlowResult, SignPermitFlowResult, SubmitTxResult, BatchTxStepResult } from './common/types';
 import { SupportedChainId } from '../../../lib/web3/wagmi/types';
 import { CallsSentObject, TxSentObject } from '../../../lib/utils/transactionHandlers';
-declare const marketSwapFlowType = "marketSwap";
+import { ReplaceTxResult } from '../../txs/mutations/useReplaceTx';
+import { CancelOrderStepKey } from '../../../components/widget/TradeOverview/steps';
 export type UseMarketFlowInput = {
     marketPrice?: OptimalRate;
 };
@@ -14,6 +15,7 @@ export type MarketSwapRequest = BuildMarketSwapTxInput & {
         destAmount: string;
     };
 };
+declare const marketSwapFlowType = "marketSwap";
 export type SubmitSwapResult = {
     tradeFlowType: typeof marketSwapFlowType;
     approve: SubmitTxResult;
@@ -55,6 +57,16 @@ export type UseMarketFlowResult = {
         isPending: boolean;
         isError: boolean;
         isSuccess: boolean;
+        isTxCancellable: boolean;
+        cancelSwapTx: () => Promise<ReplaceTxResult | undefined>;
+        cancellingState: {
+            isPending: boolean;
+            isError: boolean;
+            isSuccess: boolean;
+            error: Error | null;
+            result?: ReplaceTxResult;
+            step?: CancelOrderStepKey;
+        };
         error: Error | null;
     };
     swapBatch: BatchTxStepResult;

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

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

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

@@ -3,11 +3,12 @@ import { useAccount } from 'wagmi';
 import { useSendMarketSwapTx } from '../prices/market/mutations/useSendMarketSwapTx.js';
 import { useBuildTx } from '../prices/market/mutations/useBuildTx.js';
 import { assert } from 'ts-essentials';
+import 'viem';
 import { applySlippage } from '../../../lib/utils/price.js';
 import { useSlippage } from '../../useSlippage.js';
 import { useMutation } from '@tanstack/react-query';
 import { useRef } from 'react';
-import { UserCancelledError } from './common/errors.js';
+import { isTransactionCancelledError, TransactionCancelledError, UserCancelledError } from './common/errors.js';
 import { useSwapReceiverAddressValue } from '../../../components/widget/ReceiverAddress/state/receiverAddressAtom.js';
 import { useSwapSide } from '../../../components/widget/SwapModeSwitcher/state/swapSideAtom.js';
 import { useApproveOrPermit } from './common/useApproveOrPermit.js';
@@ -22,6 +23,7 @@ import { useAwaitCalls, useEnsureCallsStatus } from '../../batch/useAwaitCalls.j
 import { useBatchWithApproveTxs } from '../../batch/useBatchWithApproveTxs.js';
 import { useWidgetEvents } from '../../../core/state/widgetEventsAtom.js';
 import { usePricesParams } from '../prices/usePricesParams.js';
+import { useReplaceTx } from '../../txs/mutations/useReplaceTx.js';
 
 const marketSwapFlowType = "marketSwap";
 const MARKET_SWAP_MUTATION_KEY = "runMarketSwapFlow";
@@ -110,6 +112,39 @@ function useMarketFlow({
   const batchTxMined = useAwaitCalls({
     id: batchTxMut.data?.id
   });
+  const cancelSwapTxMut = useReplaceTx({
+    chainId,
+    txHash: sendSwapTxMut.txHash,
+    cancelTxType: "SWAP",
+    onSuccess: (details) => {
+      onSwap?.({
+        event: {
+          name: "Swap:cancelled",
+          params: {
+            swapMode: "market",
+            cancelTxDetails: details
+          }
+        }
+      });
+    }
+  });
+  const currentAbortControllerRef = useRef(null);
+  const cancelSwapTx = async () => {
+    try {
+      assert(sendSwapTxMut.txHash, "Swap tx hash is not available");
+      const result = await cancelSwapTxMut.replaceTx({
+        action: "cancel",
+        hash: sendSwapTxMut.txHash
+      });
+      if (result.replacementTxReceipt.status === "success") {
+        currentAbortControllerRef.current?.abort(new TransactionCancelledError("Swap tx cancelled", result));
+      }
+      return result;
+    } catch (error_2) {
+      logger.error("Cancel swap tx error", error_2);
+      cancelSwapTxMut.reset();
+    }
+  };
   const swap = {
     txHash: sendSwapTxMut.txHash,
     receipt: swapTxMined.data,
@@ -126,7 +161,18 @@ function useMarketFlow({
     isSuccess: swapTxMined.isSuccess,
     // final success
     isError: sendSwapTxMut.isError || swapTxMined.isError,
-    error: sendSwapTxMut.error || swapTxMined.error
+    error: sendSwapTxMut.error || swapTxMined.error,
+    isTxCancellable: cancelSwapTxMut.isWalletSupported && // allow to retry cancel (no !cancelSwapTxMut.isPending check) if the Cancel tx is slow
+    !!sendSwapTxMut.txHash && !swapTxMined.data && !cancelSwapTxMut.isSuccess,
+    cancelSwapTx,
+    cancellingState: {
+      isPending: cancelSwapTxMut.isPending,
+      isError: cancelSwapTxMut.isError,
+      isSuccess: cancelSwapTxMut.isSuccess,
+      error: cancelSwapTxMut.error,
+      result: cancelSwapTxMut.result,
+      step: cancelSwapTxMut.step
+    }
   };
   const lastCallsReceipt = batchTxMined.data?.receipts?.[batchTxMined.data.receipts.length - 1];
   const swapBatch = {
@@ -153,7 +199,6 @@ function useMarketFlow({
   } = useAccount();
   const ensureTxReceipt = useEnsureTxReceipt();
   const ensureCallsStatus = useEnsureCallsStatus();
-  const currentAbortControllerRef = useRef(null);
   const usingPriceRef = useRef(null);
   const cancelFlow = () => {
     currentAbortControllerRef.current?.abort(new UserCancelledError());
@@ -189,6 +234,7 @@ function useMarketFlow({
     buildTxMut.reset();
     sendSwapTxMut.reset();
     batchTxMut.reset();
+    cancelSwapTxMut.reset();
     assert(marketPrice, "Market price is not available");
     const abortController = new AbortController();
     currentAbortControllerRef.current = abortController;
@@ -292,21 +338,21 @@ function useMarketFlow({
               permit: signedPermitResult?.permitEncodedArgs
             });
           }
-        } catch (error_3) {
+        } catch (error_4) {
           if (!tryPermit) {
             approveOrPermitEvents.onApproveTx.failed({
               allowanceToSet,
-              error: error_3,
+              error: error_4,
               txHash: approveTxHash
               // won't necessarily be available
             });
           } else {
             approveOrPermitEvents.onSignPermit.failed({
               allowanceToSet: allowanceToPermit,
-              error: error_3
+              error: error_4
             });
           }
-          throw error_3;
+          throw error_4;
         }
       }
       signal.throwIfAborted();
@@ -395,7 +441,10 @@ function useMarketFlow({
           }
         });
       } else {
-        swapTxHash = await sendSwapTxMut.sendTransactionAsync(txParams);
+        swapTxHash = await sendSwapTxMut.sendTransactionAsync({
+          ...txParams,
+          chainId
+        });
         onSwap?.({
           event: {
             name: "Swap:sent",
@@ -432,7 +481,8 @@ function useMarketFlow({
               destAmount: amountsAfterSlippage_0.destAmount,
               srcAmountUSD: marketPriceToUse.srcUSD,
               destAmountUSD: marketPriceToUse.destUSD,
-              gasCost: marketPriceToUse.gasCost
+              gasCost: marketPriceToUse.gasCost,
+              swapSide: marketPriceToUse.side
             }
           });
         }
@@ -459,12 +509,25 @@ function useMarketFlow({
           }
         });
         logger.log("~ swapTx ~ awaiting tx hash :", swapTxHash);
+        signal.throwIfAborted();
+        const txCancelledPromise = new Promise((_, reject) => {
+          signal.onabort = () => {
+            try {
+              signal.throwIfAborted();
+            } catch (error_5) {
+              if (isTransactionCancelledError(error_5)) {
+                reject(error_5);
+              }
+            }
+          };
+        });
+        const txReceiptOrCancelledPromise = Promise.race([swapTxReceiptPromise, txCancelledPromise]);
         if (onTxSent) {
           onTxSent({
             chainId,
             action: "swap",
             transactionHash: swapTxHash,
-            receiptPromise: swapTxReceiptPromise,
+            receiptPromise: txReceiptOrCancelledPromise,
             transactionSpecificData: {
               action: "swap",
               source: "local",
@@ -475,11 +538,12 @@ function useMarketFlow({
               srcAmountUSD: marketPriceToUse.srcUSD,
               destAmountUSD: marketPriceToUse.destUSD,
               gasCost: marketPriceToUse.gasCost,
-              gasCostUSD: marketPriceToUse.gasCostUSD
+              gasCostUSD: marketPriceToUse.gasCostUSD,
+              swapSide: marketPriceToUse.side
             }
           });
         }
-        swapTxReceipt = await swapTxReceiptPromise;
+        swapTxReceipt = await txReceiptOrCancelledPromise;
         if (swapTxReceipt) {
           onSwap?.({
             event: {
@@ -513,20 +577,22 @@ function useMarketFlow({
         account,
         receiverAddress
       };
-    } catch (error_2) {
+    } catch (error_3) {
       if (signedPermitResult) {
         clearNonce(signedPermitResult.signedPermitData);
       }
-      onSwap?.({
-        event: {
-          name: "Swap:failed",
-          params: {
-            swapMode: "market",
-            error: error_2
+      if (!isTransactionCancelledError(error_3)) {
+        onSwap?.({
+          event: {
+            name: "Swap:failed",
+            params: {
+              swapMode: "market",
+              error: error_3
+            }
           }
-        }
-      });
-      throw error_2;
+        });
+      }
+      throw error_3;
     } finally {
       unsubscribeFromPrice?.();
     }
@@ -537,8 +603,8 @@ function useMarketFlow({
     onSuccess: (data_1) => {
       logger.log("Swap tx success", data_1);
     },
-    onError: (error_4) => {
-      logger.error("Swap tx error", error_4);
+    onError: (error_6) => {
+      logger.error("Swap tx error", error_6);
     },
     onSettled: () => {
       logger.log("Swap tx settled");
@@ -553,6 +619,7 @@ function useMarketFlow({
     sendSwapTxMut.reset();
     batchTxMut.reset();
     marketSwapMut.reset();
+    cancelSwapTxMut.reset();
   };
   const retryFlow = (options) => {
     const lastPrice_0 = usingPriceRef.current;
@@ -563,8 +630,8 @@ function useMarketFlow({
     });
   };
   const usedPrice = usingPriceRef.current || marketPrice;
-  const result = marketSwapMut.data;
-  const submittedSwapRequest = result?.swap.swapRequest;
+  const result_0 = marketSwapMut.data;
+  const submittedSwapRequest = result_0?.swap.swapRequest;
   return {
     tradeFlowType: marketSwapFlowType,
     chainId,