@rango-dev/queue-manager-rango-preset 0.1.10-next.86 → 0.1.10-next.89

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

@@ -1,7 +1,7 @@
 import { WalletType, Network, getBlockChainNameFromId } from '@rango-dev/wallets-shared';
 import { readAccountAddress } from '@rango-dev/wallets-core';
 import { RangoClient, TransactionType } from 'rango-sdk';
-import { Status, Persistor } from '@rango-dev/queue-manager-core';
+import { Status, Persistor, DB_NAME } from '@rango-dev/queue-manager-core';
 import { isSignerErrorCode, SignerErrorCode, SignerError } from 'rango-types';
 import { captureException } from '@sentry/browser';
 import { useManager } from '@rango-dev/queue-manager-react';
@@ -730,11 +730,13 @@ function updateSwapStatus(_ref) {
     message = _ref.message,
     details = _ref.details,
     _ref$errorCode = _ref.errorCode,
-    errorCode = _ref$errorCode === void 0 ? null : _ref$errorCode;
+    errorCode = _ref$errorCode === void 0 ? null : _ref$errorCode,
+    hasAlreadyProceededToSign = _ref.hasAlreadyProceededToSign;
   var swap = getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
   if (!!nextStepStatus && !!currentStep) currentStep.status = nextStepStatus;
   if (!!nextStatus) swap.status = nextStatus;
+  swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus)) swap.finishTime = new Date().getTime().toString();
   if (!!message) swap.extraMessage = message;
   if (!!details) swap.extraMessageDetail = details;
@@ -747,7 +749,7 @@ function updateSwapStatus(_ref) {
     httpService.reportFailure({
       requestId: swap.requestId,
       step: (currentStep == null ? void 0 : currentStep.id) || 1,
-      eventType: mapAppErrorCodesToAPIErrorCode(errorCode),
+      eventType: mapAppErrorCodesToAPIErrorCode(hasAlreadyProceededToSign ? APIErrorCode.TX_FAIL : errorCode),
       reason: errorReason || '',
       data: walletType ? {
         wallet: walletType
@@ -767,6 +769,7 @@ function setStepTransactionIds(_ref2, txId, eventType, notifier) {
   var getStorage = _ref2.getStorage,
     setStorage = _ref2.setStorage;
   var swap = getStorage().swapDetails;
+  swap.hasAlreadyProceededToSign = null;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var currentStep = getCurrentStep(swap);
   currentStep.executedTransactionId = txId || currentStep.executedTransactionId;
@@ -779,6 +782,15 @@ function setStepTransactionIds(_ref2, txId, eventType, notifier) {
     step: currentStep
   });
 }
+function getSwapNotitfication(eventType, updateResult) {
+  if (updateResult.swap.hasAlreadyProceededToSign) {
+    return _extends({
+      eventType: 'transaction_expired'
+    }, updateResult);
+  } else return _extends({
+    eventType: eventType
+  }, updateResult);
+}
 /**
  * If a swap needs a wallet to be connected,
  * By calling this function some related fields will be updated to show a correct message and state for notfiying the user.
@@ -1470,187 +1482,200 @@ function singTransaction(actions) {
     });
     return;
   }
-  var executeMessage = 'executing transaction';
+  var hasAlreadyProceededToSign = typeof swap.hasAlreadyProceededToSign === 'boolean';
+  var executeMessage = hasAlreadyProceededToSign ? 'Transaction is expired. Please try again' : 'executing transaction';
   var executeDetails = "" + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'Check your mobile phone' : '');
   if (!!transferTransaction) {
     var _updateResult3 = 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: 'confirm_transfer'
-    }, _updateResult3));
-    walletSigners.getSigner(TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
-      setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage4 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage4.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage4.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage4.extraMessageErrorCode;
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
+    var notification = getSwapNotitfication('confirm_transfer', _updateResult3);
+    notifier(notification);
+    if (notification.eventType !== 'transaction_expired') {
+      walletSigners.getSigner(TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
+        setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage4 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage4.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage4.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage4.extraMessageErrorCode;
+        var updateResult = updateSwapStatus({
+          getStorage: getStorage,
+          setStorage: setStorage,
+          nextStatus: 'failed',
+          nextStepStatus: 'failed',
+          message: extraMessage,
+          details: extraMessageDetail,
+          errorCode: extraMessageErrorCode
+        });
+        notifier(_extends({
+          eventType: 'transfer_rejected'
+        }, updateResult));
+        failed();
+        onFinish();
       });
-      notifier(_extends({
-        eventType: 'transfer_rejected'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
+    }
   } else if (!!evmTransaction) {
     var _updateResult4 = 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'
-    }, _updateResult4));
-    walletSigners.getSigner(TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
-      setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      var _error$root10, _error$root11, _error$root12;
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage5 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage5.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage5.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage5.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root10 = error.root) != null && _error$root10.message && error != null && (_error$root11 = error.root) != null && _error$root11.code && error != null && (_error$root12 = error.root) != null && _error$root12.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
+    var _notification = getSwapNotitfication('calling_smart_contract', _updateResult4);
+    notifier(_notification);
+    if (_notification.eventType !== 'transaction_expired') {
+      walletSigners.getSigner(TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
+        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        var _error$root10, _error$root11, _error$root12;
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage5 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage5.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage5.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage5.extraMessageErrorCode;
+        if (error && error != null && error.root && error != null && (_error$root10 = error.root) != null && _error$root10.message && error != null && (_error$root11 = error.root) != null && _error$root11.code && error != null && (_error$root12 = error.root) != null && _error$root12.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();
       });
-      notifier(_extends({
-        eventType: 'smart_contract_call_failed'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
+    }
   } else if (!!cosmosTransaction) {
     var _updateResult5 = 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'
-    }, _updateResult5));
-    // 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
-    sourceWallet.walletType === WalletType.KEPLR) {
-      var _prettifyErrorMessage6 = prettifyErrorMessage('Keplr only supports IBC Transactions on Terra. ' + 'Using Terra Bridge, TerraSwap and THORChain is not possible with Keplr. Please use TerraStation or Leap wallet'),
-        extraMessage = _prettifyErrorMessage6.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage6.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage6.extraMessageErrorCode;
-      var _updateResult6 = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
+    var _notification2 = getSwapNotitfication('calling_smart_contract', _updateResult5);
+    notifier(_notification2);
+    if (_notification2.eventType !== 'transaction_expired') {
+      // 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
+      sourceWallet.walletType === WalletType.KEPLR) {
+        var _prettifyErrorMessage6 = prettifyErrorMessage('Keplr only supports IBC Transactions on Terra. ' + 'Using Terra Bridge, TerraSwap and THORChain is not possible with Keplr. Please use TerraStation or Leap wallet'),
+          extraMessage = _prettifyErrorMessage6.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage6.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage6.extraMessageErrorCode;
+        var _updateResult6 = updateSwapStatus({
+          getStorage: getStorage,
+          setStorage: setStorage,
+          nextStatus: 'failed',
+          nextStepStatus: 'failed',
+          message: extraMessage,
+          details: extraMessageDetail,
+          errorCode: extraMessageErrorCode
+        });
+        notifier(_extends({
+          eventType: 'smart_contract_call_failed'
+        }, _updateResult6));
+        failed();
+        onFinish();
+        return;
+      }
+      walletSigners.getSigner(TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
+      // todo
+      function (id) {
+        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage7 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage7.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
+        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();
       });
-      notifier(_extends({
-        eventType: 'smart_contract_call_failed'
-      }, _updateResult6));
-      failed();
-      onFinish();
-      return;
     }
-    walletSigners.getSigner(TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
-    // todo
-    function (id) {
-      setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage7 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage7.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
-      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 (!!solanaTransaction) {
     var _updateResult7 = 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'
-    }, _updateResult7));
-    var tx = solanaTransaction;
-    walletSigners.getSigner(TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
-      setStepTransactionIds(actions, txId, 'smart_contract_called', notifier);
-      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-      next();
-      onFinish();
-    }, function (error) {
-      if (swap.status === 'failed') return;
-      var _prettifyErrorMessage8 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage8.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage8.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage8.extraMessageErrorCode;
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
+    var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult7);
+    notifier(_notification3);
+    if (_notification3.eventType !== 'transaction_expired') {
+      var tx = solanaTransaction;
+      walletSigners.getSigner(TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
+        setStepTransactionIds(actions, txId, 'smart_contract_called', notifier);
+        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+        next();
+        onFinish();
+      }, function (error) {
+        if (swap.status === 'failed') return;
+        var _prettifyErrorMessage8 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage8.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage8.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage8.extraMessageErrorCode;
+        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();
       });
-      notifier(_extends({
-        eventType: 'smart_contract_call_failed'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
+    }
   } else if (!!tronTransaction) {
     var _updateResult8 = updateSwapStatus({
       getStorage: getStorage,
@@ -2358,28 +2383,59 @@ var MIGRATED_KEY = 'migratedToQueueManager';
 function migrated() {
   return !!window.localStorage.getItem(MIGRATED_KEY);
 }
+function hasQueueManagerOnIDB() {
+  return _hasQueueManagerOnIDB.apply(this, arguments);
+}
 /**
  *
  * By calling this function, we first check if the data already migrated or not,
  * If not, starting to migrating to IndexedDb with proper format that queue manager is understand.
  *
  */
+function _hasQueueManagerOnIDB() {
+  _hasQueueManagerOnIDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return window.indexedDB.databases();
+        case 3:
+          return _context.abrupt("return", _context.sent.map(function (db) {
+            return db.name;
+          }).includes(DB_NAME));
+        case 6:
+          _context.prev = 6;
+          _context.t0 = _context["catch"](0);
+          return _context.abrupt("return", false);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 6]]);
+  }));
+  return _hasQueueManagerOnIDB.apply(this, arguments);
+}
 function migration() {
   return _migration.apply(this, arguments);
 }
 function _migration() {
-  _migration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var swapsFromStorage, swaps, convertedSwaps, persistor, promises;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _migration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var swapsFromStorage, hasIndexDB, swaps, convertedSwaps, persistor, promises;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          swapsFromStorage = window.localStorage.getItem('pendingSwaps'); // For new users or already migrated.
-          if (!(!swapsFromStorage || migrated())) {
-            _context.next = 3;
+          swapsFromStorage = window.localStorage.getItem('pendingSwaps');
+          _context2.next = 3;
+          return hasQueueManagerOnIDB();
+        case 3:
+          hasIndexDB = _context2.sent;
+          if (!(!swapsFromStorage || migrated() || hasIndexDB)) {
+            _context2.next = 6;
             break;
           }
-          return _context.abrupt("return", true);
-        case 3:
+          return _context2.abrupt("return", true);
+        case 6:
           // For old users, but they didn't do any swaps yet.
           swaps = JSON.parse(swapsFromStorage);
           convertedSwaps = [];
@@ -2442,17 +2498,17 @@ function _migration() {
           promises = convertedSwaps.map(function (queue) {
             return persistor.insertQueue(queue);
           });
-          _context.next = 10;
+          _context2.next = 13;
           return Promise.all(promises);
-        case 10:
+        case 13:
           // Mark as the data has been successfully migrated.
           window.localStorage.setItem(MIGRATED_KEY, '1');
-          return _context.abrupt("return", true);
-        case 12:
+          return _context2.abrupt("return", true);
+        case 15:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee);
+    }, _callee2);
   }));
   return _migration.apply(this, arguments);
 }