@rango-dev/queue-manager-rango-preset 0.1.13-next.0 → 0.1.13-next.2

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');
@@ -1186,7 +1187,7 @@ function _isNetworkMatchedForTransaction() {
             _context2.next = 23;
             break;
           }
-          if (![WalletType.META_MASK, WalletType.BINANCE_CHAIN, WalletType.XDEFI, WalletType.WALLET_CONNECT, WalletType.TRUST_WALLET, WalletType.COIN98, WalletType.EXODUS, WalletType.OKX, WalletType.COINBASE, WalletType.TOKEN_POCKET, WalletType.MATH, WalletType.SAFEPAL, WalletType.COSMOSTATION, WalletType.CLOVER, WalletType.BRAVE, WalletType.FRONTIER, WalletType.KUCOIN].includes(sourceWallet.walletType)) {
+          if (![WalletType.META_MASK, WalletType.BINANCE_CHAIN, WalletType.XDEFI, WalletType.WALLET_CONNECT, WalletType.TRUST_WALLET, WalletType.COIN98, WalletType.EXODUS, WalletType.OKX, WalletType.COINBASE, WalletType.TOKEN_POCKET, WalletType.MATH, WalletType.SAFEPAL, WalletType.COSMOSTATION, WalletType.CLOVER, WalletType.BRAVE, WalletType.FRONTIER, WalletType.KUCOIN, WalletType.ENKRYPT].includes(sourceWallet.walletType)) {
             _context2.next = 22;
             break;
           }
@@ -2553,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);
@@ -2572,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;
@@ -2589,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();
       }