@rango-dev/queue-manager-rango-preset 0.1.15-next.6 → 0.1.15-next.8

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

@@ -829,20 +829,17 @@ function claimQueue() {
     }
   };
 }
-/**
- *
- * We use module-level variable to keep track of
- * map of transactions hash to the TransactionResponse
- *
- */
-var swapTransactionToResponseMap = {};
-function useTransactionsResponse() {
+var swapTransactionToDataMap = {};
+function useTransactionsData() {
   return {
-    getTransactionResponseByHash: function getTransactionResponseByHash(hash) {
-      return swapTransactionToResponseMap[hash];
+    getTransactionDataByHash: function getTransactionDataByHash(hash) {
+      return swapTransactionToDataMap[hash] || {};
     },
-    setTransactionResponseByHash: function setTransactionResponseByHash(hash, response) {
-      swapTransactionToResponseMap[hash] = response;
+    setTransactionDataByHash: function setTransactionDataByHash(hash, data) {
+      var r = swapTransactionToDataMap[hash];
+      if (!r) swapTransactionToDataMap[hash] = {};
+      swapTransactionToDataMap[hash].response = data.response || swapTransactionToDataMap[hash].response;
+      swapTransactionToDataMap[hash].receiptReceived = data.receiptReceived || swapTransactionToDataMap[hash].receiptReceived || false;
     }
   };
 }
@@ -960,7 +957,7 @@ function updateSwapStatus(_ref) {
   var swap = getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
   if (!!nextStepStatus && !!currentStep) currentStep.status = nextStepStatus;
-  if (!!nextStatus) swap.status = nextStatus;
+  if (nextStatus) swap.status = nextStatus;
   swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus)) swap.finishTime = new Date().getTime().toString();
   if (!!message || !!details) {
@@ -1006,7 +1003,7 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, explorerUrl) {
   var currentStep = getCurrentStep(swap);
   currentStep.executedTransactionId = txId;
   currentStep.executedTransactionTime = new Date().getTime().toString();
-  if (!!(explorerUrl != null && explorerUrl.url)) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+  if (explorerUrl != null && explorerUrl.url) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
     url: explorerUrl.url,
     description: explorerUrl.description || null
   }]);
@@ -1022,7 +1019,7 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, explorerUrl) {
   setStorage(_extends({}, getStorage(), {
     swapDetails: swap
   }));
-  if (!!eventType) notifier({
+  if (eventType) notifier({
     eventType: eventType,
     swap: swap,
     step: currentStep
@@ -1393,16 +1390,18 @@ function onBlockForChangeNetwork(_event, meta) {
     type = _getRequiredWallet2.type,
     network = _getRequiredWallet2.network;
   if (!!type && !!network) {
-    var _result = context.switchNetwork(type, network);
-    if (_result) {
-      _result.then(function () {
-        queue.unblock();
-      })["catch"](function (error) {
-        // ignore switch network errors
-        console.log({
-          error: error
+    if (context.canSwitchNetworkTo(type, network)) {
+      var _result = context.switchNetwork(type, network);
+      if (_result) {
+        _result.then(function () {
+          queue.unblock();
+        })["catch"](function (error) {
+          // ignore switch network errors
+          console.log({
+            error: error
+          });
         });
-      });
+      }
     }
   }
 }
@@ -1464,7 +1463,7 @@ function onDependsOnOtherQueues(_event, meta) {
     resetClaimedBy: function resetClaimedBy() {
       reset();
       // TODO: Use key generator
-      retryOn(type + "-" + network + ":" + address, context.notifier, manager);
+      retryOn(type + "-" + network + ":" + address, context.notifier, manager, context.canSwitchNetworkTo);
     }
   });
 }
@@ -1497,8 +1496,8 @@ function isRequiredWalletConnected(swap, getState) {
   };
 }
 function singTransaction(actions) {
-  var _useTransactionsRespo = useTransactionsResponse(),
-    setTransactionResponseByHash = _useTransactionsRespo.setTransactionResponseByHash;
+  var _useTransactionsData = useTransactionsData(),
+    setTransactionDataByHash = _useTransactionsData.setTransactionDataByHash;
   var getStorage = actions.getStorage,
     setStorage = actions.setStorage,
     failed = actions.failed,
@@ -1576,7 +1575,9 @@ function singTransaction(actions) {
       description: isApproval ? 'Approve' : 'Swap'
     } : undefined);
     // response used for evm transactions to get receipt and track replaced
-    response && setTransactionResponseByHash(hash, response);
+    response && setTransactionDataByHash(hash, {
+      response: response
+    });
     schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
     next();
     onFinish();
@@ -1739,8 +1740,8 @@ function resetRunningSwapNotifsOnPageLoad(runningSwaps, notifier) {
  * @param manager
  * @returns
  */
-function retryOn(wallet_network, notifier, manager, options) {
-  var _finalQueueToBeRun;
+function retryOn(wallet_network, notifier, manager, canSwitchNetworkTo, options) {
+  var _finalQueueToBeRun, _finalQueueToBeRun2;
   if (options === void 0) {
     options = {
       fallbackToOnlyWallet: true
@@ -1788,7 +1789,7 @@ function retryOn(wallet_network, notifier, manager, options) {
   } else if (onlyWalletMatched.length > 0 && options.fallbackToOnlyWallet) {
     finalQueueToBeRun = onlyWalletMatched[0];
   }
-  (_finalQueueToBeRun = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun.checkBlock();
+  if (!(canSwitchNetworkTo != null && canSwitchNetworkTo(wallet, network))) (_finalQueueToBeRun = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun.unblock();else (_finalQueueToBeRun2 = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun2.checkBlock();
 }
 /*
   For avoiding conflict by making too many requests to wallet, we need to make sure
@@ -1810,27 +1811,22 @@ function _throwOnOK() {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context3.prev = 0;
-          _context3.next = 3;
+          _context3.next = 2;
           return rawResponse;
-        case 3:
+        case 2:
           responseBody = _context3.sent;
           if (!(!responseBody.ok || !responseBody.transaction)) {
-            _context3.next = 6;
+            _context3.next = 5;
             break;
           }
           throw PrettyError.CreateTransaction(responseBody.error || 'bad response from create tx endpoint');
-        case 6:
+        case 5:
           return _context3.abrupt("return", responseBody);
-        case 9:
-          _context3.prev = 9;
-          _context3.t0 = _context3["catch"](0);
-          throw _context3.t0;
-        case 12:
+        case 6:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 9]]);
+    }, _callee3);
   }));
   return _throwOnOK.apply(this, arguments);
 }
@@ -1867,7 +1863,7 @@ function checkTransactionStatus(_x) {
 function _checkTransactionStatus() {
   _checkTransactionStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _status, _status2, _status3, _status4, _status5, _status6, _status7, _status9, _status10, _status11;
-    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, currentStep, txId, getTxReceiptFailed, status, signer, _useTransactionsRespo, getTransactionResponseByHash, setTransactionResponseByHash, txType, sourceWallet, _signer, txResponse, _yield$signer$wait, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer, _prettifyErrorMessage, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, outputAmount, prevOutputAmount, newTransaction, nextStep, _status8;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, currentStep, txId, getTxReceiptFailed, status, signer, _useTransactionsData, getTransactionDataByHash, setTransactionDataByHash, txType, sourceWallet, _signer, _getTransactionDataBy, txResponse, receiptReceived, _yield$signer$wait, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer, _prettifyErrorMessage, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, outputAmount, prevOutputAmount, newTransaction, nextStep, _status8;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1875,11 +1871,17 @@ function _checkTransactionStatus() {
           swap = getStorage().swapDetails;
           meta = context.meta; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
+          if (currentStep != null && currentStep.executedTransactionId) {
+            _context.next = 6;
+            break;
+          }
+          return _context.abrupt("return");
+        case 6:
           txId = currentStep.executedTransactionId;
           getTxReceiptFailed = false;
           status = null;
           signer = null;
-          _useTransactionsRespo = useTransactionsResponse(), getTransactionResponseByHash = _useTransactionsRespo.getTransactionResponseByHash, setTransactionResponseByHash = _useTransactionsRespo.setTransactionResponseByHash;
+          _useTransactionsData = useTransactionsData(), getTransactionDataByHash = _useTransactionsData.getTransactionDataByHash, setTransactionDataByHash = _useTransactionsData.setTransactionDataByHash;
           try {
             txType = getCurrentStepTxType(currentStep);
             sourceWallet = getRelatedWallet(swap, currentStep);
@@ -1888,15 +1890,16 @@ function _checkTransactionStatus() {
             // wallet is not connected yet
             // no need to do anything
           }
-          _context.prev = 10;
-          if (!((_signer = signer) != null && _signer.wait)) {
-            _context.next = 19;
+          _context.prev = 12;
+          // if wallet is connected, try to get transaction reciept
+          _getTransactionDataBy = getTransactionDataByHash(txId), txResponse = _getTransactionDataBy.response, receiptReceived = _getTransactionDataBy.receiptReceived;
+          if (!((_signer = signer) != null && _signer.wait && !receiptReceived)) {
+            _context.next = 21;
             break;
           }
-          txResponse = getTransactionResponseByHash(txId);
-          _context.next = 15;
+          _context.next = 17;
           return signer.wait(txId, txResponse);
-        case 15:
+        case 17:
           _yield$signer$wait = _context.sent;
           updatedTxHash = _yield$signer$wait.hash;
           updatedTxResponse = _yield$signer$wait.response;
@@ -1913,14 +1916,20 @@ function _checkTransactionStatus() {
               }
             }
             txId = currentStep.executedTransactionId;
-            if (updatedTxHash && updatedTxResponse) setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+            if (updatedTxHash && updatedTxResponse) setTransactionDataByHash(updatedTxHash, {
+              response: updatedTxResponse
+            });
+          } else {
+            setTransactionDataByHash(updatedTxHash, {
+              receiptReceived: true
+            });
           }
-        case 19:
-          _context.next = 27;
-          break;
         case 21:
-          _context.prev = 21;
-          _context.t0 = _context["catch"](10);
+          _context.next = 29;
+          break;
+        case 23:
+          _context.prev = 23;
+          _context.t0 = _context["catch"](12);
           _prettifyErrorMessage = prettifyErrorMessage(_context.t0), extraMessage = _prettifyErrorMessage.extraMessage, extraMessageDetail = _prettifyErrorMessage.extraMessageDetail, extraMessageErrorCode = _prettifyErrorMessage.extraMessageErrorCode;
           updateResult = updateSwapStatus({
             getStorage: getStorage,
@@ -1937,39 +1946,39 @@ function _checkTransactionStatus() {
           getTxReceiptFailed = true;
           // We shouldn't return here, because we need to trigger check status job in backend.
           // This is not a ui requirement but the backend one.
-        case 27:
-          _context.prev = 27;
-          _context.next = 30;
+        case 29:
+          _context.prev = 29;
+          _context.next = 32;
           return httpService().checkStatus({
             requestId: swap.requestId,
             txId: txId,
             step: currentStep.id
           });
-        case 30:
+        case 32:
           status = _context.sent;
-          _context.next = 39;
+          _context.next = 41;
           break;
-        case 33:
-          _context.prev = 33;
-          _context.t1 = _context["catch"](27);
-          _context.next = 37;
+        case 35:
+          _context.prev = 35;
+          _context.t1 = _context["catch"](29);
+          _context.next = 39;
           return delay(INTERVAL_FOR_CHECK);
-        case 37:
+        case 39:
           retry();
           return _context.abrupt("return");
-        case 39:
+        case 41:
           if (!getTxReceiptFailed) {
-            _context.next = 41;
+            _context.next = 43;
             break;
           }
           return _context.abrupt("return", failed());
-        case 41:
+        case 43:
           if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
-            _context.next = 43;
+            _context.next = 45;
             break;
           }
           return _context.abrupt("return");
-        case 43:
+        case 45:
           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;
@@ -2015,31 +2024,31 @@ function _checkTransactionStatus() {
             swapDetails: swap
           }));
           if (!(((_status9 = status) == null ? void 0 : _status9.status) === 'failed')) {
-            _context.next = 62;
+            _context.next = 64;
             break;
           }
           failed();
-          _context.next = 70;
+          _context.next = 72;
           break;
-        case 62:
+        case 64:
           if (!(((_status10 = status) == null ? void 0 : _status10.status) === 'success' || ((_status11 = status) == null ? void 0 : _status11.status) === 'running' && !!status.newTx)) {
-            _context.next = 67;
+            _context.next = 69;
             break;
           }
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context.next = 70;
+          _context.next = 72;
           break;
-        case 67:
-          _context.next = 69;
-          return delay(INTERVAL_FOR_CHECK);
         case 69:
+          _context.next = 71;
+          return delay(INTERVAL_FOR_CHECK);
+        case 71:
           retry();
-        case 70:
+        case 72:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[10, 21], [27, 33]]);
+    }, _callee, null, [[12, 23], [29, 35]]);
   }));
   return _checkTransactionStatus.apply(this, arguments);
 }
@@ -2056,14 +2065,14 @@ function checkApprovalStatus(_x2) {
  */
 function _checkApprovalStatus() {
   _checkApprovalStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, _useTransactionsRespo2, getTransactionResponseByHash, setTransactionResponseByHash, currentStep, txId, signer, txType, sourceWallet, _signer2, txResponse, _yield$signer$wait2, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer2, _prettifyErrorMessage2, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, isApproved, response, message, details, _updateResult;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, _useTransactionsData2, getTransactionDataByHash, setTransactionDataByHash, currentStep, txId, signer, txType, sourceWallet, _signer2, _getTransactionDataBy2, txResponse, receiptReceived, _yield$signer$wait2, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer2, _prettifyErrorMessage2, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, isApproved, response, message, details, _updateResult;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       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;
           meta = context.meta;
-          _useTransactionsRespo2 = useTransactionsResponse(), getTransactionResponseByHash = _useTransactionsRespo2.getTransactionResponseByHash, setTransactionResponseByHash = _useTransactionsRespo2.setTransactionResponseByHash;
+          _useTransactionsData2 = useTransactionsData(), getTransactionDataByHash = _useTransactionsData2.getTransactionDataByHash, setTransactionDataByHash = _useTransactionsData2.setTransactionDataByHash;
           currentStep = getCurrentStep(swap);
           if (currentStep) {
             _context2.next = 8;
@@ -2072,6 +2081,12 @@ function _checkApprovalStatus() {
           console.log('ignore check status, current step is null');
           return _context2.abrupt("return");
         case 8:
+          if (currentStep != null && currentStep.executedTransactionId) {
+            _context2.next = 10;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 10:
           txId = currentStep.executedTransactionId;
           signer = null;
           try {
@@ -2082,15 +2097,15 @@ function _checkApprovalStatus() {
             // wallet is not connected yet
             // no need to do anything
           }
-          _context2.prev = 11;
-          if (!((_signer2 = signer) != null && _signer2.wait)) {
-            _context2.next = 20;
+          _context2.prev = 13;
+          _getTransactionDataBy2 = getTransactionDataByHash(txId), txResponse = _getTransactionDataBy2.response, receiptReceived = _getTransactionDataBy2.receiptReceived; // if wallet is connected, try to get transaction reciept
+          if (!((_signer2 = signer) != null && _signer2.wait && !receiptReceived)) {
+            _context2.next = 22;
             break;
           }
-          txResponse = getTransactionResponseByHash(txId);
-          _context2.next = 16;
+          _context2.next = 18;
           return signer.wait(txId, txResponse);
-        case 16:
+        case 18:
           _yield$signer$wait2 = _context2.sent;
           updatedTxHash = _yield$signer$wait2.hash;
           updatedTxResponse = _yield$signer$wait2.response;
@@ -2107,14 +2122,20 @@ function _checkApprovalStatus() {
               }
             }
             txId = currentStep.executedTransactionId;
-            if (updatedTxHash && updatedTxResponse) setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+            if (updatedTxHash && updatedTxResponse) setTransactionDataByHash(updatedTxHash, {
+              response: updatedTxResponse
+            });
+          } else {
+            setTransactionDataByHash(updatedTxHash, {
+              receiptReceived: true
+            });
           }
-        case 20:
-          _context2.next = 28;
-          break;
         case 22:
-          _context2.prev = 22;
-          _context2.t0 = _context2["catch"](11);
+          _context2.next = 30;
+          break;
+        case 24:
+          _context2.prev = 24;
+          _context2.t0 = _context2["catch"](13);
           _prettifyErrorMessage2 = prettifyErrorMessage(_context2.t0), extraMessage = _prettifyErrorMessage2.extraMessage, extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail, extraMessageErrorCode = _prettifyErrorMessage2.extraMessageErrorCode;
           updateResult = updateSwapStatus({
             getStorage: getStorage,
@@ -2129,19 +2150,19 @@ function _checkApprovalStatus() {
             eventType: 'task_failed'
           }, updateResult));
           return _context2.abrupt("return", failed());
-        case 28:
+        case 30:
           isApproved = false;
-          _context2.prev = 29;
-          _context2.next = 32;
-          return httpService().checkApproval(swap.requestId, currentStep.executedTransactionId || '');
-        case 32:
+          _context2.prev = 31;
+          _context2.next = 34;
+          return httpService().checkApproval(swap.requestId, currentStep.executedTransactionId);
+        case 34:
           response = _context2.sent;
           if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
-            _context2.next = 35;
+            _context2.next = 37;
             break;
           }
           return _context2.abrupt("return");
-        case 35:
+        case 37:
           isApproved = response.isApproved;
           if (!isApproved && (response.txStatus === 'failed' || response.txStatus === 'success')) {
             if (response.txStatus === 'failed') {
@@ -2174,15 +2195,15 @@ function _checkApprovalStatus() {
               step: currentStep
             });
           }
-          _context2.next = 42;
+          _context2.next = 44;
           break;
-        case 39:
-          _context2.prev = 39;
-          _context2.t1 = _context2["catch"](29);
+        case 41:
+          _context2.prev = 41;
+          _context2.t1 = _context2["catch"](31);
           isApproved = false;
-        case 42:
+        case 44:
           if (!isApproved) {
-            _context2.next = 58;
+            _context2.next = 60;
             break;
           }
           currentStep.status = 'approved';
@@ -2204,18 +2225,18 @@ function _checkApprovalStatus() {
           });
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context2.next = 61;
+          _context2.next = 63;
           break;
-        case 58:
-          _context2.next = 60;
-          return delay(2000);
         case 60:
+          _context2.next = 62;
+          return delay(2000);
+        case 62:
           retry();
-        case 61:
+        case 63:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[11, 22], [29, 39]]);
+    }, _callee2, null, [[13, 24], [31, 41]]);
   }));
   return _checkApprovalStatus.apply(this, arguments);
 }
@@ -2737,7 +2758,7 @@ function useQueueManager(params) {
         manager: manager,
         notifier: params.notifier
       });
-      retryOn(params.lastConnectedWallet, params.notifier, manager);
+      retryOn(params.lastConnectedWallet, params.notifier, manager, params.canSwitchNetworkTo);
     }
   }, [params.lastConnectedWallet]);
   useEffect(function () {