@rango-dev/queue-manager-rango-preset 0.1.10-next.94 → 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.
@@ -1498,7 +1506,10 @@ function singTransaction(actions) {
     });
     var notification = getSwapNotitfication('confirm_transfer', _updateResult3);
     notifier(notification);
-    if (notification.eventType !== 'transaction_expired') {
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       walletSigners.getSigner(TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
         setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
@@ -1538,7 +1549,10 @@ function singTransaction(actions) {
     });
     var _notification = getSwapNotitfication('calling_smart_contract', _updateResult4);
     notifier(_notification);
-    if (_notification.eventType !== 'transaction_expired') {
+    if (_notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       walletSigners.getSigner(TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
         setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
@@ -1582,7 +1596,10 @@ function singTransaction(actions) {
     });
     var _notification2 = getSwapNotitfication('calling_smart_contract', _updateResult5);
     notifier(_notification2);
-    if (_notification2.eventType !== 'transaction_expired') {
+    if (_notification2.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       // If keplr wallet is executing contracts on terra, throw error. keplr doesn't support transfer or execute contracts. only IBC messages are supported
       if (((currentStep == null ? void 0 : currentStep.swapperId.toString()) === 'TerraSwap' || (currentStep == null ? void 0 : currentStep.swapperId.toString()) === 'ThorChain' && (currentStep == null ? void 0 : currentStep.fromBlockchain) === Network.TERRA || (currentStep == null ? void 0 : currentStep.swapperId.toString()) === 'Terra Bridge' && currentStep.fromBlockchain === Network.TERRA) &&
       // here we must allow ibc on terrastatus
@@ -1648,7 +1665,10 @@ function singTransaction(actions) {
     });
     var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult7);
     notifier(_notification3);
-    if (_notification3.eventType !== 'transaction_expired') {
+    if (_notification3.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       var tx = solanaTransaction;
       walletSigners.getSigner(TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
         setStepTransactionIds(actions, txId, 'smart_contract_called', notifier);
@@ -1681,93 +1701,105 @@ function singTransaction(actions) {
     var _updateResult8 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: 'running',
+      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
       message: executeMessage,
-      details: executeDetails
+      details: executeDetails,
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign
     });
-    notifier(_extends({
-      eventType: 'calling_smart_contract'
-    }, _updateResult8));
-    walletSigners.getSigner(TransactionType.TRON).signAndSendTx(tronTransaction, walletAddress, null).then(function (id) {
-      setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      var _error$root13, _error$root14, _error$root15;
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage9 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage9.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage9.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage9.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root13 = error.root) != null && _error$root13.message && error != null && (_error$root14 = error.root) != null && _error$root14.code && error != null && (_error$root15 = error.root) != null && _error$root15.reason) {
-        logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-      }
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
-      });
-      notifier(_extends({
-        eventType: 'smart_contract_call_failed'
-      }, updateResult));
+    var _notification4 = getSwapNotitfication('calling_smart_contract', _updateResult8);
+    notifier(_notification4);
+    if (_notification4.eventType === 'transaction_expired') {
       failed();
       onFinish();
-    });
+    } else {
+      walletSigners.getSigner(TransactionType.TRON).signAndSendTx(tronTransaction, walletAddress, null).then(function (id) {
+        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        var _error$root13, _error$root14, _error$root15;
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage9 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage9.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage9.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage9.extraMessageErrorCode;
+        if (error && error != null && error.root && error != null && (_error$root13 = error.root) != null && _error$root13.message && error != null && (_error$root14 = error.root) != null && _error$root14.code && error != null && (_error$root15 = error.root) != null && _error$root15.reason) {
+          logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
+        }
+        var updateResult = updateSwapStatus({
+          getStorage: getStorage,
+          setStorage: setStorage,
+          nextStatus: 'failed',
+          nextStepStatus: 'failed',
+          message: extraMessage,
+          details: extraMessageDetail,
+          errorCode: extraMessageErrorCode
+        });
+        notifier(_extends({
+          eventType: 'smart_contract_call_failed'
+        }, updateResult));
+        failed();
+        onFinish();
+      });
+    }
   } else if (!!starknetTransaction) {
     var _updateResult9 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: 'running',
+      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
       message: executeMessage,
-      details: executeDetails
+      details: executeDetails,
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign
     });
-    notifier(_extends({
-      eventType: 'calling_smart_contract'
-    }, _updateResult9));
-    walletSigners.getSigner(TransactionType.STARKNET).signAndSendTx(starknetTransaction, walletAddress, null).then(function (id) {
-      setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      var _error$root16, _error$root17, _error$root18;
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage10 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage10.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage10.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage10.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root16 = error.root) != null && _error$root16.message && error != null && (_error$root17 = error.root) != null && _error$root17.code && error != null && (_error$root18 = error.root) != null && _error$root18.reason) {
-        logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-      }
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
-      });
-      notifier(_extends({
-        eventType: 'smart_contract_call_failed'
-      }, updateResult));
+    var _notification5 = getSwapNotitfication('calling_smart_contract', _updateResult9);
+    notifier(_notification5);
+    if (_notification5.eventType === 'transaction_expired') {
       failed();
       onFinish();
-    });
+    } else {
+      walletSigners.getSigner(TransactionType.STARKNET).signAndSendTx(starknetTransaction, walletAddress, null).then(function (id) {
+        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        var _error$root16, _error$root17, _error$root18;
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage10 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage10.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage10.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage10.extraMessageErrorCode;
+        if (error && error != null && error.root && error != null && (_error$root16 = error.root) != null && _error$root16.message && error != null && (_error$root17 = error.root) != null && _error$root17.code && error != null && (_error$root18 = error.root) != null && _error$root18.reason) {
+          logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
+        }
+        var updateResult = updateSwapStatus({
+          getStorage: getStorage,
+          setStorage: setStorage,
+          nextStatus: 'failed',
+          nextStepStatus: 'failed',
+          message: extraMessage,
+          details: extraMessageDetail,
+          errorCode: extraMessageErrorCode
+        });
+        notifier(_extends({
+          eventType: 'smart_contract_call_failed'
+        }, updateResult));
+        failed();
+        onFinish();
+      });
+    }
   }
 }
 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;
@@ -1785,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;
@@ -1849,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;
   }
@@ -2005,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)) {
@@ -2271,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:
@@ -2290,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 = {
@@ -2318,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);
@@ -2335,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();
       }