@rango-dev/queue-manager-rango-preset 0.1.10-next.102 → 0.1.10-next.103

package/package.json

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

package/src/actions/executeTransaction.ts

@@ -79,7 +79,7 @@ export async function executeTransaction(
   */
   const needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
 
-  if (needsToBlockQueue && !isClaimed && context.claimedBy) {
+  if (needsToBlockQueue && !isClaimed) {
     const blockedFor = {
       reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
       description: 'Waiting for other swaps to complete',

package/src/helpers.ts

@@ -746,6 +746,8 @@ export function onDependsOnOtherQueues(
   const claimerId = claimedBy();
   const isClaimedByAnyQueue = !!claimerId;
 
+  if (claimerId === queue.id) return;
+
   // Check if any queue `claimed` before, if yes, we don't should do anything.
   if (isClaimedByAnyQueue) {
     // We need to keep the latest swap messages
@@ -781,7 +783,7 @@ export function onDependsOnOtherQueues(
     resetClaimedBy: () => {
       reset();
       // TODO: Use key generator
-      retryOn(`${type}-${network}-${address}`, context.notifier, manager);
+      retryOn(`${type}-${network}:${address}`, context.notifier, manager);
     },
   });
 }