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

package/dist/queue-manager-rango-preset.esm.js

@@ -469,6 +469,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
+var ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES = 'Waiting for other swaps to complete';
 var ERROR_MESSAGE_WAIT_FOR_WALLET = 'Waiting for connecting wallet';
 var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address) {
   return "Please change your " + (type || 'wallet') + " account to " + (address || 'proper address');
@@ -2114,7 +2115,7 @@ function retryOn(wallet_network, notifier, manager, options) {
   We only run one request at a time (In parallel mode).
   */
 function isNeedBlockQueueForParallel(step) {
-  return !!step.evmTransaction || !!step.evmApprovalTransaction || !!step.cosmosTransaction;
+  return !!step.evmTransaction || !!step.evmApprovalTransaction;
 }
 /*
 Create transaction endpoint doesn't return error code on http status code,
@@ -2215,6 +2216,12 @@ function _checkTransactionStatus() {
           retry();
           return _context.abrupt("return");
         case 17:
+          if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
+            _context.next = 19;
+            break;
+          }
+          return _context.abrupt("return");
+        case 19:
           outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (!!currentStep.outputAmount ? currentStep.outputAmount : null);
           prevOutputAmount = currentStep.outputAmount || null;
           swap.extraMessage = ((_status2 = status) == null ? void 0 : _status2.extraMessage) || swap.extraMessage;
@@ -2279,19 +2286,19 @@ function _checkTransactionStatus() {
             swapDetails: swap
           }));
           if (!(((_status8 = status) == null ? void 0 : _status8.status) === 'failed' || ((_status9 = status) == null ? void 0 : _status9.status) === 'success' || ((_status10 = status) == null ? void 0 : _status10.status) === 'running' && !!status.newTx)) {
-            _context.next = 37;
+            _context.next = 39;
             break;
           }
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context.next = 40;
+          _context.next = 42;
           break;
-        case 37:
-          _context.next = 39;
-          return delay(INTERVAL_FOR_CHECK);
         case 39:
+          _context.next = 41;
+          return delay(INTERVAL_FOR_CHECK);
+        case 41:
           retry();
-        case 40:
+        case 42:
         case "end":
           return _context.stop();
       }
@@ -2317,14 +2324,7 @@ function _checkApprovalStatus() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           getStorage = _ref2.getStorage, setStorage = _ref2.setStorage, next = _ref2.next, schedule = _ref2.schedule, retry = _ref2.retry, failed = _ref2.failed, context = _ref2.context;
-          swap = getStorage().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
+          swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
           isApproved = false;
           _context2.prev = 4;
@@ -2332,6 +2332,12 @@ function _checkApprovalStatus() {
           return httpService().checkApproval(swap.requestId, currentStep.executedTransactionId || '');
         case 7:
           response = _context2.sent;
+          if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
+            _context2.next = 10;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 10:
           isApproved = response.isApproved;
           if (!isApproved && response.txStatus === 'failed') {
             // approve transaction failed on
@@ -2358,15 +2364,15 @@ function _checkApprovalStatus() {
               step: currentStep
             });
           }
-          _context2.next = 15;
+          _context2.next = 17;
           break;
-        case 12:
-          _context2.prev = 12;
+        case 14:
+          _context2.prev = 14;
           _context2.t0 = _context2["catch"](4);
           isApproved = false;
-        case 15:
+        case 17:
           if (!isApproved) {
-            _context2.next = 31;
+            _context2.next = 33;
             break;
           }
           currentStep.status = 'approved';
@@ -2388,18 +2394,18 @@ function _checkApprovalStatus() {
           });
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context2.next = 34;
+          _context2.next = 36;
           break;
-        case 31:
-          _context2.next = 33;
-          return delay(2000);
         case 33:
+          _context2.next = 35;
+          return delay(2000);
+        case 35:
           retry();
-        case 34:
+        case 36:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 12]]);
+    }, _callee2, null, [[4, 14]]);
   }));
   return _checkApprovalStatus.apply(this, arguments);
 }
@@ -2548,12 +2554,13 @@ function executeTransaction(_x) {
 function _executeTransaction() {
   _executeTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actions) {
     var _context$_queue;
-    var getStorage, context, meta, wallets, providers, isClaimed, requestBlock, swap, currentStep, isWrongAddress, _wallets$blockchains, _getRequiredWallet, type, address, isWalletInCompatible, description, blockedFor, needsToBlockQueue, _blockedFor, networkMatched, fromBlockchain, details, _blockedFor2;
+    var getStorage, context, meta, wallets, providers, _claimQueue, claimedBy, isClaimed, requestBlock, swap, currentStep, isWrongAddress, _wallets$blockchains, _getRequiredWallet, type, address, isWalletInCompatible, description, blockedFor, networkMatched, claimerId, isClaimedByAnyQueue, details, _blockedFor, fromBlockchain, _details, _blockedFor2, needsToBlockQueue, _blockedFor3;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           getStorage = actions.getStorage, context = actions.context;
           meta = context.meta, wallets = context.wallets, providers = context.providers;
+          _claimQueue = claimQueue(), claimedBy = _claimQueue.claimedBy;
           isClaimed = context.claimedBy === ((_context$_queue = context._queue) == null ? void 0 : _context$_queue.id);
           requestBlock = function requestBlock(blockedFor) {
             actions.block(blockedFor);
@@ -2567,7 +2574,7 @@ function _executeTransaction() {
           /* Make sure wallet is connected and also the connected wallet is matched with tx by checking address. */
           isWrongAddress = !isRequiredWalletConnected(swap, context.state).ok;
           if (!isWrongAddress) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
           _getRequiredWallet = getRequiredWallet(swap), type = _getRequiredWallet.type, address = _getRequiredWallet.address;
@@ -2584,51 +2591,65 @@ function _executeTransaction() {
           };
           requestBlock(blockedFor);
           return _context.abrupt("return");
-        case 15:
-          /*
-          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).
-          */
-          needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
-          if (!(needsToBlockQueue && !isClaimed)) {
-            _context.next = 20;
+        case 16:
+          _context.next = 18;
+          return isNetworkMatchedForTransaction(swap, currentStep, wallets, meta, providers);
+        case 18:
+          networkMatched = _context.sent;
+          claimerId = claimedBy();
+          isClaimedByAnyQueue = !!claimerId && !isClaimed;
+          if (!(isClaimedByAnyQueue && !networkMatched)) {
+            _context.next = 28;
             break;
           }
+          details = ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES;
           _blockedFor = {
             reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
-            description: 'Waiting for other swaps to complete',
-            details: {}
+            details: details
           };
           requestBlock(_blockedFor);
           return _context.abrupt("return");
-        case 20:
-          _context.next = 22;
-          return isNetworkMatchedForTransaction(swap, currentStep, wallets, meta, providers);
-        case 22:
-          networkMatched = _context.sent;
+        case 28:
           if (networkMatched) {
-            _context.next = 31;
+            _context.next = 36;
             break;
           }
           fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
-          details = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(fromBlockchain);
+          _details = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(fromBlockchain);
           _blockedFor2 = {
             reason: BlockReason.WAIT_FOR_NETWORK_CHANGE,
-            details: details
+            details: _details
           };
           requestBlock(_blockedFor2);
           return _context.abrupt("return");
-        case 31:
+        case 36:
           // Update network to mark it as network changed successfully.
           updateNetworkStatus(actions, {
             message: '',
             details: 'Wallet network changed successfully',
             status: PendingSwapNetworkStatus.NetworkChanged
           });
-        case 32:
+        case 37:
+          /*
+          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).
+          */
+          needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
+          if (!(needsToBlockQueue && !isClaimed)) {
+            _context.next = 42;
+            break;
+          }
+          _blockedFor3 = {
+            reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
+            description: ERROR_MESSAGE_DEPENDS_ON_OTHER_QUEUES,
+            details: {}
+          };
+          requestBlock(_blockedFor3);
+          return _context.abrupt("return");
+        case 42:
           // All the conditions are met. We can safely send the tx to wallet for sign.
           singTransaction(actions);
-        case 33:
+        case 43:
         case "end":
           return _context.stop();
       }