@rango-dev/queue-manager-rango-preset 0.1.12 → 0.1.13-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.12",
+  "version": "0.1.13-next.1",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/actions/checkStatus.ts

@@ -53,6 +53,9 @@ async function checkTransactionStatus({
     return;
   }
 
+  // If user cancel swap during check status api call, we should ignore check status response
+  if (currentStep?.status === 'failed') return;
+
   const outputAmount: string | null =
     status?.outputAmount ||
     (!!currentStep.outputAmount ? currentStep.outputAmount : null);
@@ -166,13 +169,6 @@ async function checkApprovalStatus({
   SwapQueueContext
 >): Promise<void> {
   const swap = getStorage().swapDetails as SwapStorage['swapDetails'];
-  // double check it after fixing parallel
-  // const onFinish = () => {
-  //   // TODO resetClaimedBy is undefined here
-  //   if (context.resetClaimedBy) {
-  //     context.resetClaimedBy();
-  //   }
-  // };
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
   let isApproved = false;
@@ -181,6 +177,9 @@ async function checkApprovalStatus({
       swap.requestId,
       currentStep.executedTransactionId || ''
     );
+    // If user cancel swap during check status api call, we should ignore check approval response
+    if (currentStep?.status === 'failed') return;
+
     isApproved = response.isApproved;
     if (!isApproved && response.txStatus === 'failed') {
       // approve transaction failed on

package/src/actions/executeTransaction.ts

@@ -1,5 +1,6 @@
 import { ExecuterActions } from '@rango-dev/queue-manager-core';
 import {
+  ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES,
   ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK,
   ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION,
   ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET,
@@ -14,6 +15,7 @@ import {
   resetNetworkStatus,
   getRequiredWallet,
   isNeedBlockQueueForParallel,
+  claimQueue,
 } from '../helpers';
 import { getCurrentBlockchainOf, PendingSwapNetworkStatus } from '../shared';
 import {
@@ -37,6 +39,7 @@ export async function executeTransaction(
 ): Promise<void> {
   const { getStorage, context } = actions;
   const { meta, wallets, providers } = context;
+  const { claimedBy } = claimQueue();
 
   const isClaimed = context.claimedBy === context._queue?.id;
   const requestBlock: typeof actions.block = (blockedFor) => {
@@ -73,22 +76,6 @@ export async function executeTransaction(
     return;
   }
 
-  /* 
-  For avoiding conflict by making too many requests to wallet, we need to make sure
-  We only run one request at a time (In parallel mode).
-  */
-  const needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
-
-  if (needsToBlockQueue && !isClaimed) {
-    const blockedFor = {
-      reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
-      description: 'Waiting for other swaps to complete',
-      details: {},
-    };
-    requestBlock(blockedFor);
-    return;
-  }
-
   /* Wallet should be on correct network */
   const networkMatched = await isNetworkMatchedForTransaction(
     swap,
@@ -97,7 +84,18 @@ export async function executeTransaction(
     meta,
     providers
   );
-  if (!networkMatched) {
+  const claimerId = claimedBy();
+  const isClaimedByAnyQueue = !!claimerId && !isClaimed;
+  if (isClaimedByAnyQueue && !networkMatched) {
+    const details = ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES;
+
+    const blockedFor = {
+      reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
+      details: details,
+    };
+    requestBlock(blockedFor);
+    return;
+  } else if (!networkMatched) {
     const fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
     const details = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(fromBlockchain);
 
@@ -116,6 +114,22 @@ export async function executeTransaction(
     });
   }
 
+  /* 
+  For avoiding conflict by making too many requests to wallet, we need to make sure
+  We only run one request at a time (In parallel mode).
+  */
+  const needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
+
+  if (needsToBlockQueue && !isClaimed) {
+    const blockedFor = {
+      reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
+      description: ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES,
+      details: {},
+    };
+    requestBlock(blockedFor);
+    return;
+  }
+
   // All the conditions are met. We can safely send the tx to wallet for sign.
   singTransaction(actions);
 }

package/src/helpers.ts

@@ -79,7 +79,7 @@ let swapClaimedBy: { id: string } | null = null;
  * We simply use module-level variable to keep track of which queue has claimed the execution of parallel runnings.
  *
  */
-function claimQueue() {
+export function claimQueue() {
   return {
     claimedBy: () => swapClaimedBy?.id,
     setClaimer: (queue_id: string) => {
@@ -1733,11 +1733,7 @@ export function retryOn(
   We only run one request at a time (In parallel mode).
   */
 export function isNeedBlockQueueForParallel(step: PendingSwapStep): boolean {
-  return (
-    !!step.evmTransaction ||
-    !!step.evmApprovalTransaction ||
-    !!step.cosmosTransaction
-  );
+  return !!step.evmTransaction || !!step.evmApprovalTransaction;
 }
 
 /*