@rango-dev/queue-manager-rango-preset 0.1.10-next.95 → 0.1.10-next.96

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

@@ -708,6 +708,14 @@ function claimQueue() {
     }
   };
 }
+/**
+ *
+ * Returns "wallet and network" separately, even if the wallet is dashed inside.
+ *
+ */
+function splitWalletNetwork(input) {
+  return input == null ? void 0 : input.split(/-(?=[^-]*$)/);
+}
 /**
  *
  * Returns `steps`, if it's a `running` swap.
@@ -1789,9 +1797,9 @@ function checkWaitingForConnectWalletChange(params) {
   var wallet_network = params.wallet_network,
     evmChains = params.evmChains,
     manager = params.manager;
-  var _wallet_network$split = wallet_network.split('-'),
-    wallet = _wallet_network$split[0],
-    network = _wallet_network$split[1];
+  var _splitWalletNetwork = splitWalletNetwork(wallet_network),
+    wallet = _splitWalletNetwork[0],
+    network = _splitWalletNetwork[1];
   // We only need change network for EVM chains.
   if (!evmChains.some(function (chain) {
     return chain.name == network;
@@ -1809,7 +1817,7 @@ function checkWaitingForConnectWalletChange(params) {
           var task = q.list.state.tasks[taskId];
           return task.status === Status.BLOCKED && [BlockReason.WAIT_FOR_CONNECT_WALLET].includes((_task$blockedFor = task.blockedFor) == null ? void 0 : _task$blockedFor.reason);
         });
-        if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
+        if (currentStepRequiredWallet === wallet && hasWaitingForConnect && getCurrentBlockchainOfOrNull(swap, currentStep) != network) {
           var queueInstance = q.list;
           var _getRequiredWallet5 = getRequiredWallet(swap),
             type = _getRequiredWallet5.type;
@@ -1873,9 +1881,9 @@ function retryOn(wallet_network, manager, options) {
       fallbackToOnlyWallet: true
     };
   }
-  var _wallet_network$split2 = wallet_network.split('-'),
-    wallet = _wallet_network$split2[0],
-    network = _wallet_network$split2[1];
+  var _splitWalletNetwork2 = splitWalletNetwork(wallet_network),
+    wallet = _splitWalletNetwork2[0],
+    network = _splitWalletNetwork2[1];
   if (!wallet || !network) {
     return;
   }
@@ -2029,6 +2037,7 @@ function _checkTransactionStatus() {
             currentStep.starknetTransaction = null;
             currentStep.tronApprovalTransaction = null;
             currentStep.tronTransaction = null;
+            currentStep.fromBlockchain = newTransaction.blockChain;
             if (isEvmTransaction(newTransaction)) {
               if (newTransaction.isApprovalTx) currentStep.evmApprovalTransaction = newTransaction;else currentStep.evmTransaction = newTransaction;
             } else if (isCosmosTransaction(newTransaction)) {
@@ -2295,7 +2304,7 @@ 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, _getRequiredWallet, type, address, description, blockedFor, needsToBlockQueue, _blockedFor, networkMatched, fromBlockchain, details, _blockedFor2;
+    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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -2314,25 +2323,31 @@ function _executeTransaction() {
           /* Make sure wallet is connected and also the connected wallet is matched with tx by checking address. */
           isWrongAddress = !isRequiredWalletConnected(swap, context.state);
           if (!isWrongAddress) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
           _getRequiredWallet = getRequiredWallet(swap), type = _getRequiredWallet.type, address = _getRequiredWallet.address;
-          description = !wallets ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type) : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
+          isWalletInCompatible = wallets == null ? void 0 : (_wallets$blockchains = wallets.blockchains) == null ? void 0 : _wallets$blockchains.find(function (w) {
+            var _w$accounts;
+            return !((_w$accounts = w.accounts) != null && _w$accounts.find(function (account) {
+              return account.walletType === type;
+            }));
+          });
+          description = !wallets || isWalletInCompatible ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type) : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
           blockedFor = {
             reason: BlockReason.WAIT_FOR_CONNECT_WALLET,
             description: description
           };
           requestBlock(blockedFor);
           return _context.abrupt("return");
-        case 14:
+        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.claimedBy)) {
-            _context.next = 19;
+            _context.next = 20;
             break;
           }
           _blockedFor = {
@@ -2342,13 +2357,13 @@ function _executeTransaction() {
           };
           requestBlock(_blockedFor);
           return _context.abrupt("return");
-        case 19:
-          _context.next = 21;
+        case 20:
+          _context.next = 22;
           return isNetworkMatchedForTransaction(swap, currentStep, wallets, meta, providers);
-        case 21:
+        case 22:
           networkMatched = _context.sent;
           if (networkMatched) {
-            _context.next = 30;
+            _context.next = 31;
             break;
           }
           fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
@@ -2359,17 +2374,17 @@ function _executeTransaction() {
           };
           requestBlock(_blockedFor2);
           return _context.abrupt("return");
-        case 30:
+        case 31:
           // Update network to mark it as network changed successfully.
           updateNetworkStatus(actions, {
             message: '',
             details: 'Wallet network changed successfully',
             status: PendingSwapNetworkStatus.NetworkChanged
           });
-        case 31:
+        case 32:
           // All the conditions are met. We can safely send the tx to wallet for sign.
           singTransaction(actions);
-        case 32:
+        case 33:
         case "end":
           return _context.stop();
       }