@rango-dev/queue-manager-rango-preset 0.1.13-next.15 → 0.1.13-next.17

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

@@ -1,4 +1,4 @@
-import { WalletType, Network, getBlockChainNameFromId } from '@rango-dev/wallets-shared';
+import { Network, getBlockChainNameFromId } from '@rango-dev/wallets-shared';
 import { readAccountAddress } from '@rango-dev/wallets-core';
 import { RangoClient, TransactionType } from 'rango-sdk';
 import { Status, Persistor, DB_NAME } from '@rango-dev/queue-manager-core';
@@ -679,7 +679,7 @@ function getRelatedWallet(swap, currentStep) {
   var blockchain = (walletKV == null ? void 0 : walletKV.k) || null;
   var wallet = (walletKV == null ? void 0 : walletKV.v) || null;
   var walletType = wallet == null ? void 0 : wallet.walletType;
-  if (walletType === WalletType.UNKNOWN || wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed: walletType: " + walletType);
+  if (wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed: walletType: " + walletType);
   return wallet;
 }
 function getRelatedWalletOrNull(swap, currentStep) {
@@ -990,9 +990,7 @@ function markRunningSwapAsSwitchingNetwork(_ref4) {
     type = _getRequiredWallet.type;
   var fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
   var reason = "Change " + type + " wallet network to " + fromBlockchain;
-  var metamaskMessage = '';
-  if (type === WalletType.META_MASK) metamaskMessage = "(Networks -> Select '" + fromBlockchain + "' network.)";
-  var reasonDetail = "Please change your " + type + " wallet network to " + fromBlockchain + ". " + metamaskMessage;
+  var reasonDetail = "Please change your " + type + " wallet network to " + fromBlockchain + ".";
   var currentTime = new Date();
   swap.lastNotificationTime = currentTime.getTime().toString();
   currentStep.networkStatus = PendingSwapNetworkStatus.WaitingForNetworkChange;
@@ -1183,26 +1181,22 @@ function _isNetworkMatchedForTransaction() {
           if (!meta.evmBasedChains.find(function (evmBlochain) {
             return evmBlochain.name === fromBlockChain;
           })) {
-            _context2.next = 29;
+            _context2.next = 25;
             break;
           }
           _context2.prev = 6;
           sourceWallet = swap.wallets[fromBlockChain];
           if (!sourceWallet) {
-            _context2.next = 23;
-            break;
-          }
-          if (![WalletType.META_MASK, WalletType.BINANCE_CHAIN, WalletType.XDEFI, WalletType.WALLET_CONNECT, WalletType.TRUST_WALLET, WalletType.COIN98, WalletType.EXODUS, WalletType.OKX, WalletType.COINBASE, WalletType.TOKEN_POCKET, WalletType.MATH, WalletType.SAFEPAL, WalletType.COSMOSTATION, WalletType.CLOVER, WalletType.BRAVE, WalletType.FRONTIER, WalletType.KUCOIN, WalletType.ENKRYPT].includes(sourceWallet.walletType)) {
-            _context2.next = 22;
+            _context2.next = 19;
             break;
           }
           provider = getEvmProvider(providers, sourceWallet.walletType);
-          _context2.next = 13;
+          _context2.next = 12;
           return getChainId(provider);
-        case 13:
+        case 12:
           chainId = _context2.sent;
           if (!chainId) {
-            _context2.next = 20;
+            _context2.next = 19;
             break;
           }
           blockChain = getBlockChainNameFromId(chainId, Object.entries(meta.blockchains).map(function (_ref6) {
@@ -1210,37 +1204,32 @@ function _isNetworkMatchedForTransaction() {
             return blockchainMeta;
           }));
           if (!(blockChain && blockChain.toLowerCase() === fromBlockChain.toLowerCase())) {
-            _context2.next = 18;
+            _context2.next = 17;
             break;
           }
           return _context2.abrupt("return", true);
-        case 18:
+        case 17:
           if (!(blockChain && blockChain.toLowerCase() !== fromBlockChain.toLowerCase())) {
-            _context2.next = 20;
+            _context2.next = 19;
             break;
           }
           return _context2.abrupt("return", false);
-        case 20:
-          _context2.next = 23;
-          break;
-        case 22:
-          return _context2.abrupt("return", true);
-        case 23:
-          _context2.next = 28;
+        case 19:
+          _context2.next = 24;
           break;
-        case 25:
-          _context2.prev = 25;
+        case 21:
+          _context2.prev = 21;
           _context2.t0 = _context2["catch"](6);
           console.log(_context2.t0);
-        case 28:
+        case 24:
           return _context2.abrupt("return", false);
-        case 29:
+        case 25:
           return _context2.abrupt("return", true);
-        case 30:
+        case 26:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 25]]);
+    }, _callee2, null, [[6, 21]]);
   }));
   return _isNetworkMatchedForTransaction.apply(this, arguments);
 }
@@ -1458,7 +1447,8 @@ function singTransaction(actions) {
     context = actions.context;
   var meta = context.meta,
     getSigners = context.getSigners,
-    notifier = context.notifier;
+    notifier = context.notifier,
+    isMobileWallet = context.isMobileWallet;
   var swap = getStorage().swapDetails;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var currentStep = getCurrentStep(swap);
@@ -1474,6 +1464,7 @@ function singTransaction(actions) {
   var sourceWallet = getRelatedWallet(swap, currentStep);
   var walletAddress = getCurrentAddressOf(swap, currentStep);
   var walletSigners = getSigners(sourceWallet.walletType);
+  var mobileWallet = isMobileWallet(sourceWallet.walletType);
   var onFinish = function onFinish() {
     // TODO resetClaimedBy is undefined here
     if (actions.context.resetClaimedBy) {
@@ -1484,7 +1475,7 @@ function singTransaction(actions) {
     var spenderContract = evmApprovalTransaction == null ? void 0 : evmApprovalTransaction.to;
     if (!spenderContract) throw PrettyError.AssertionFailed('contract address is null for checking approval');
     // Update swap status
-    var message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'on your mobile phone' : '');
+    var message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
     var updateResult = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
@@ -1530,7 +1521,7 @@ function singTransaction(actions) {
     return;
   } else if (!!tronApprovalTransaction) {
     // Update swap status
-    var _message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'on your mobile phone' : '');
+    var _message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
     var _updateResult = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
@@ -1576,7 +1567,7 @@ function singTransaction(actions) {
     return;
   } else if (!!starknetApprovalTransaction) {
     // Update swap status
-    var _message2 = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'on your mobile phone' : '');
+    var _message2 = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
     var _updateResult2 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
@@ -1625,7 +1616,7 @@ function singTransaction(actions) {
   var nextStepStatusBasedOnHasAlreadyProceededToSign = hasAlreadyProceededToSign ? 'failed' : 'running';
   var errorCodeBasedOnHasAlreadyProceededToSign = hasAlreadyProceededToSign ? 'TX_EXPIRED' : null;
   var executeMessage = hasAlreadyProceededToSign ? 'Transaction is expired. Please try again' : 'executing transaction';
-  var executeDetails = "" + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'Check your mobile phone' : '');
+  var executeDetails = mobileWallet ? 'Check your mobile phone' : '';
   if (!!transferTransaction) {
     var _updateResult3 = updateSwapStatus({
       getStorage: getStorage,
@@ -1735,30 +1726,6 @@ function singTransaction(actions) {
       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
-      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) {
@@ -1768,10 +1735,10 @@ function singTransaction(actions) {
         onFinish();
       }, function (error) {
         if (swap.status === 'failed') return;
-        var _prettifyErrorMessage7 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage7.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
+        var _prettifyErrorMessage6 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage6.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage6.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage6.extraMessageErrorCode;
         var updateResult = updateSwapStatus({
           getStorage: getStorage,
           setStorage: setStorage,
@@ -1789,7 +1756,7 @@ function singTransaction(actions) {
       });
     }
   } else if (!!solanaTransaction) {
-    var _updateResult7 = updateSwapStatus({
+    var _updateResult6 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
@@ -1799,7 +1766,7 @@ function singTransaction(actions) {
       hasAlreadyProceededToSign: hasAlreadyProceededToSign,
       errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
-    var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult7);
+    var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult6);
     notifier(_notification3);
     if (_notification3.eventType === 'transaction_expired') {
       failed();
@@ -1813,10 +1780,10 @@ function singTransaction(actions) {
         onFinish();
       }, function (error) {
         if (swap.status === 'failed') return;
-        var _prettifyErrorMessage8 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage8.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage8.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage8.extraMessageErrorCode;
+        var _prettifyErrorMessage7 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage7.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
         var updateResult = updateSwapStatus({
           getStorage: getStorage,
           setStorage: setStorage,
@@ -1834,7 +1801,7 @@ function singTransaction(actions) {
       });
     }
   } else if (!!tronTransaction) {
-    var _updateResult8 = updateSwapStatus({
+    var _updateResult7 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
@@ -1844,7 +1811,7 @@ function singTransaction(actions) {
       hasAlreadyProceededToSign: hasAlreadyProceededToSign,
       errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
-    var _notification4 = getSwapNotitfication('calling_smart_contract', _updateResult8);
+    var _notification4 = getSwapNotitfication('calling_smart_contract', _updateResult7);
     notifier(_notification4);
     if (_notification4.eventType === 'transaction_expired') {
       failed();
@@ -1858,10 +1825,10 @@ function singTransaction(actions) {
       }, 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;
+        var _prettifyErrorMessage8 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage8.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage8.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage8.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);
         }
@@ -1882,7 +1849,7 @@ function singTransaction(actions) {
       });
     }
   } else if (!!starknetTransaction) {
-    var _updateResult9 = updateSwapStatus({
+    var _updateResult8 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
@@ -1892,7 +1859,7 @@ function singTransaction(actions) {
       hasAlreadyProceededToSign: hasAlreadyProceededToSign,
       errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
-    var _notification5 = getSwapNotitfication('calling_smart_contract', _updateResult9);
+    var _notification5 = getSwapNotitfication('calling_smart_contract', _updateResult8);
     notifier(_notification5);
     if (_notification5.eventType === 'transaction_expired') {
       failed();
@@ -1906,10 +1873,10 @@ function singTransaction(actions) {
       }, 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;
+        var _prettifyErrorMessage9 = prettifyErrorMessage(error),
+          extraMessage = _prettifyErrorMessage9.extraMessage,
+          extraMessageDetail = _prettifyErrorMessage9.extraMessageDetail,
+          extraMessageErrorCode = _prettifyErrorMessage9.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);
         }