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

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

@@ -1498,7 +1498,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 +1541,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 +1588,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 +1657,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,84 +1693,96 @@ 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) {
@@ -2486,7 +2510,7 @@ function _migration() {
               var _tasks;
               var taskId = v4();
               var convertedSwap = {
-                id: v4(),
+                id: swap.requestId,
                 createdAt: Number(swap.creationTime),
                 name: 'swap',
                 status: Status.RUNNING,
@@ -2514,7 +2538,7 @@ function _migration() {
                */
               var status = swap.status === 'success' ? Status.SUCCESS : Status.FAILED;
               var _convertedSwap = {
-                id: v4(),
+                id: swap.requestId,
                 createdAt: Number(swap.creationTime),
                 name: 'swap',
                 status: status,