@rango-dev/queue-manager-rango-preset 0.1.10-next.77 → 0.1.10-next.80

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

@@ -1,7 +1,8 @@
-import BigNumber$1, { BigNumber } from 'bignumber.js';
-import { WalletError, isWalletErrorCode, WalletErrorCode, TransactionType, getBlockChainNameFromId, WalletType, Network } from '@rango-dev/wallets-shared';
+import { WalletType, getBlockChainNameFromId, Network } from '@rango-dev/wallets-shared';
 import { readAccountAddress } from '@rango-dev/wallets-core';
+import { RangoClient, TransactionType } from 'rango-sdk';
 import { Status } from '@rango-dev/queue-manager-core';
+import { isSignerErrorCode, SignerErrorCode, SignerError } from 'rango-types';
 import { captureException } from '@sentry/browser';
 
 var SwapActionTypes;
@@ -444,9 +445,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var RANGO_DAPP_ID_QUERY = process.env.REACT_APP_RANGO_DAPP_ID_QUERY;
-var BASE_URL = process.env.REACT_APP_BASE_URL;
-var RANGO_COOKIE_HEADER = 'X-Rango-Id';
+var RANGO_DAPP_API_KEY = process.env.REACT_API_KEY;
 var ERROR_MESSAGE_WAIT_FOR_WALLET = 'Waiting for connecting wallet';
 var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address) {
   return "Please change your " + (type || 'wallet') + " account to " + (address || 'proper address');
@@ -486,9 +485,6 @@ var TransactionName;
   TransactionName["Approval"] = "approve transaction";
 })(TransactionName || (TransactionName = {}));
 var ERROR_ASSERTION_FAILED = 'Assertion failed (Unexpected behaviour)';
-var ERROR_COMMUNICATING_WITH_API = function ERROR_COMMUNICATING_WITH_API(apiMethodName) {
-  return "Unexpected response from API (" + apiMethodName + ")";
-};
 var ERROR_CREATE_TRANSACTION = 'Create transaction failed in Rango Server';
 var ERROR_INPUT_WALLET_NOT_FOUND = 'Input wallet not found';
 var PrettyError = /*#__PURE__*/function (_Error) {
@@ -529,6 +525,24 @@ var PrettyError = /*#__PURE__*/function (_Error) {
   };
   return PrettyError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
+function isAPIErrorCode(value) {
+  return Object.values(APIErrorCode).includes(value);
+}
+function mapAppErrorCodesToAPIErrorCode(errorCode) {
+  var defaultErrorCode = APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR;
+  try {
+    if (!errorCode) return defaultErrorCode;
+    if (isAPIErrorCode(errorCode)) return errorCode;
+    if (isSignerErrorCode(errorCode)) {
+      var _t;
+      var t = (_t = {}, _t[SignerErrorCode.REJECTED_BY_USER] = APIErrorCode.USER_REJECT, _t[SignerErrorCode.SIGN_TX_ERROR] = APIErrorCode.CALL_WALLET_FAILED, _t[SignerErrorCode.SEND_TX_ERROR] = APIErrorCode.SEND_TX_FAILED, _t[SignerErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[SignerErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[SignerErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
+      return t[errorCode];
+    }
+    return defaultErrorCode;
+  } catch (err) {
+    return defaultErrorCode;
+  }
+}
 
 var PendingSwapNetworkStatus;
 (function (PendingSwapNetworkStatus) {
@@ -575,13 +589,19 @@ var getEvmApproveUrl = function getEvmApproveUrl(tx, network, evmBasedBlockchain
   if (evmBlochain.info.transactionUrl) return evmBlochain.info.transactionUrl.replace('{txHash}', tx.toLowerCase());
   throw Error("Explorer url for " + network + " is not implemented");
 };
+var getStarknetApproveUrl = function getStarknetApproveUrl(tx) {
+  return 'https://starkscan.co/tx/{txHash}'.replace('{txHash}', tx.toLowerCase());
+};
+var getTronApproveUrl = function getTronApproveUrl(tx) {
+  return 'https://tronscan.org/#/transaction/{txHash}'.replace('{txHash}', tx.toLowerCase());
+};
 var prettifyErrorMessage = function prettifyErrorMessage(obj) {
   if (!obj) return {
     extraMessage: '',
     extraMessageErrorCode: null
   };
   if (obj instanceof PrettyError) return obj.getErrorDetail();
-  if (obj instanceof WalletError) {
+  if (obj instanceof SignerError) {
     var t = obj.getErrorDetail();
     return {
       extraMessage: t.message,
@@ -602,21 +622,38 @@ var prettifyErrorMessage = function prettifyErrorMessage(obj) {
     extraMessageErrorCode: null
   };
 };
-function getCookieId() {
-  var key = 'X-Rango-Id';
-  var cookieId = window.localStorage.getItem(key);
-  if (cookieId) {
-    return cookieId;
-  }
-  var value = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-  window.localStorage.setItem(key, value);
-  return value;
-}
 function getNextStep(swap, currentStep) {
   return swap.steps.find(function (step) {
     return step.status !== 'failed' && step.status !== 'success' && step.id !== currentStep.id;
   }) || null;
 }
+// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
+var getCurrentAddressOf = function getCurrentAddressOf(swap, step) {
+  var _step$evmTransaction2, _step$evmApprovalTran2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac2, _step$transferTransac3;
+  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac2 = step.transferTransaction) != null && _step$transferTransac2.fromWalletAddress ? {
+    address: (_step$transferTransac3 = step.transferTransaction) == null ? void 0 : _step$transferTransac3.fromWalletAddress
+  } : null) || null;
+  if (result == null) throw PrettyError.WalletMissing();
+  return result.address;
+};
+// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
+function getRelatedWallet(swap, currentStep) {
+  var walletAddress = getCurrentAddressOf(swap, currentStep);
+  var walletKV = Object.keys(swap.wallets).map(function (k) {
+    return {
+      k: k,
+      v: swap.wallets[k]
+    };
+  }).find(function (_ref) {
+    var v = _ref.v;
+    return v.address === walletAddress;
+  }) || null;
+  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);
+  return wallet;
+}
 function getRelatedWalletOrNull(swap, currentStep) {
   try {
     return getRelatedWallet(swap, currentStep);
@@ -643,200 +680,7 @@ function logRPCError(error, swap, currentStep, walletType) {
   }
 }
 
-function checkSwapStatus(_x, _x2, _x3) {
-  return _checkSwapStatus.apply(this, arguments);
-}
-function _checkSwapStatus() {
-  _checkSwapStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(requestId, txId, step) {
-    var _headers;
-    var url, body, response, apiError, res;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          url = BASE_URL + "/tx/check-status?" + RANGO_DAPP_ID_QUERY;
-          body = {
-            step: step,
-            txId: txId,
-            requestId: requestId
-          };
-          _context.next = 4;
-          return fetch(url, {
-            method: 'POST',
-            headers: (_headers = {}, _headers[RANGO_COOKIE_HEADER] = getCookieId(), _headers['content-type'] = 'application/json;charset=UTF-8', _headers),
-            body: JSON.stringify(body)
-          });
-        case 4:
-          response = _context.sent;
-          if (!(!!response.status && (response.status < 200 || response.status >= 400) || !response.ok)) {
-            _context.next = 8;
-            break;
-          }
-          apiError = ERROR_COMMUNICATING_WITH_API(ApiMethodName.CheckingTransactionStatus);
-          throw PrettyError.BadStatusCode(apiError, response.status);
-        case 8:
-          _context.next = 10;
-          return response.json();
-        case 10:
-          res = _context.sent;
-          return _context.abrupt("return", _extends({}, res, {
-            outputAmount: res.outputAmount ? new BigNumber(res.outputAmount) : null
-          }));
-        case 12:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _checkSwapStatus.apply(this, arguments);
-}
-function createTransaction(_x4) {
-  return _createTransaction.apply(this, arguments);
-}
-function _createTransaction() {
-  _createTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(request) {
-    var url, _headers2, response, result;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          url = BASE_URL + "/tx/create?" + RANGO_DAPP_ID_QUERY;
-          _context2.prev = 1;
-          _context2.next = 4;
-          return fetch(url, {
-            method: 'POST',
-            headers: (_headers2 = {
-              'content-type': 'application/json;charset=UTF-8'
-            }, _headers2[RANGO_COOKIE_HEADER] = getCookieId(), _headers2),
-            body: JSON.stringify(request)
-          });
-        case 4:
-          response = _context2.sent;
-          if (!(!!response.status && (response.status < 200 || response.status >= 400) || !response.ok)) {
-            _context2.next = 7;
-            break;
-          }
-          throw PrettyError.CreateTransaction("Error creating the transaction, status code: " + response.status);
-        case 7:
-          _context2.next = 9;
-          return response.json();
-        case 9:
-          result = _context2.sent;
-          if (!(!result.ok || !result.transaction)) {
-            _context2.next = 12;
-            break;
-          }
-          throw PrettyError.CreateTransaction(result.error || 'bad response from create tx endpoint');
-        case 12:
-          return _context2.abrupt("return", result);
-        case 15:
-          _context2.prev = 15;
-          _context2.t0 = _context2["catch"](1);
-          if (!(_context2.t0 instanceof Error)) {
-            _context2.next = 19;
-            break;
-          }
-          throw PrettyError.CreateTransaction(_context2.t0.message);
-        case 19:
-          throw _context2.t0;
-        case 20:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2, null, [[1, 15]]);
-  }));
-  return _createTransaction.apply(this, arguments);
-}
-function checkApproved(_x5) {
-  return _checkApproved.apply(this, arguments);
-}
-function _checkApproved() {
-  _checkApproved = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(requestId) {
-    var _headers3;
-    var url, response, apiError;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          url = BASE_URL + "/tx/" + requestId + "/check-approval?" + RANGO_DAPP_ID_QUERY;
-          _context3.next = 3;
-          return fetch(url, {
-            method: 'GET',
-            headers: (_headers3 = {
-              'content-type': 'application/json;charset=UTF-8'
-            }, _headers3[RANGO_COOKIE_HEADER] = getCookieId(), _headers3)
-          });
-        case 3:
-          response = _context3.sent;
-          if (!(!!response.status && (response.status < 200 || response.status >= 400) || !response.ok)) {
-            _context3.next = 7;
-            break;
-          }
-          apiError = ERROR_COMMUNICATING_WITH_API(ApiMethodName.CheckApproval);
-          throw PrettyError.BadStatusCode(apiError, response.status);
-        case 7:
-          _context3.next = 9;
-          return response.json();
-        case 9:
-          return _context3.abrupt("return", _context3.sent);
-        case 10:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return _checkApproved.apply(this, arguments);
-}
-function isAPIErrorCode(value) {
-  return Object.values(APIErrorCode).includes(value);
-}
-function mapAppErrorCodesToAPIErrorCode(errorCode) {
-  var defaultErrorCode = APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR;
-  try {
-    if (!errorCode) return defaultErrorCode;
-    if (isAPIErrorCode(errorCode)) return errorCode;
-    if (isWalletErrorCode(errorCode)) {
-      var _t;
-      var t = (_t = {}, _t[WalletErrorCode.REJECTED_BY_USER] = APIErrorCode.USER_REJECT, _t[WalletErrorCode.SIGN_TX_ERROR] = APIErrorCode.CALL_WALLET_FAILED, _t[WalletErrorCode.SEND_TX_ERROR] = APIErrorCode.SEND_TX_FAILED, _t[WalletErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[WalletErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[WalletErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
-      return t[errorCode];
-    }
-    return defaultErrorCode;
-  } catch (err) {
-    return defaultErrorCode;
-  }
-}
-function reportFailed(_x6, _x7, _x8, _x9, _x10) {
-  return _reportFailed.apply(this, arguments);
-}
-function _reportFailed() {
-  _reportFailed = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(requestId, step, eventType, reason, walletType) {
-    var _headers4;
-    var url;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          url = BASE_URL + "/tx/report-tx?" + RANGO_DAPP_ID_QUERY;
-          _context4.next = 3;
-          return fetch(url, {
-            method: 'POST',
-            headers: (_headers4 = {
-              'content-type': 'application/json;charset=UTF-8'
-            }, _headers4[RANGO_COOKIE_HEADER] = getCookieId(), _headers4),
-            body: JSON.stringify({
-              requestId: requestId,
-              step: step,
-              eventType: eventType,
-              reason: reason,
-              tags: {
-                wallet: walletType
-              }
-            })
-          });
-        case 3:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return _reportFailed.apply(this, arguments);
-}
+var httpService = /*#__PURE__*/new RangoClient(RANGO_DAPP_API_KEY || '');
 
 var swapClaimedBy = null;
 /**
@@ -895,8 +739,17 @@ function updateSwapStatus(_ref) {
     var _getRelatedWalletOrNu;
     //if user cancel the swap, we should pass relevant reason to the server.
     var errorReason = details && details.includes('Warning') ? 'Swap canceled by user.' : details;
+    var walletType = (_getRelatedWalletOrNu = getRelatedWalletOrNull(swap, currentStep)) == null ? void 0 : _getRelatedWalletOrNu.walletType;
     swap.extraMessageSeverity = MessageSeverity.error;
-    reportFailed(swap.requestId, (currentStep == null ? void 0 : currentStep.id) || 1, mapAppErrorCodesToAPIErrorCode(errorCode), errorReason || '', (currentStep ? (_getRelatedWalletOrNu = getRelatedWalletOrNull(swap, currentStep)) == null ? void 0 : _getRelatedWalletOrNu.walletType : null) || null).then();
+    httpService.reportFailure({
+      requestId: swap.requestId,
+      step: (currentStep == null ? void 0 : currentStep.id) || 1,
+      eventType: mapAppErrorCodesToAPIErrorCode(errorCode),
+      reason: errorReason || '',
+      data: walletType ? {
+        wallet: walletType
+      } : undefined
+    }).then()["catch"]();
   } else if (!!nextStepStatus && ['running'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.info;else if (!!nextStepStatus && ['success', 'approved'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.success;else if (nextStepStatus && ['waitingForApproval'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.warning;
   if (nextStepStatus === 'running' && currentStep) currentStep.startTransactionTime = new Date().getTime();
   setStorage(_extends({}, getStorage(), {
@@ -1156,7 +1009,7 @@ function _isNetworkMatchedForTransaction() {
             _context2.next = 24;
             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].includes(sourceWallet.walletType)) {
+          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].includes(sourceWallet.walletType)) {
             _context2.next = 23;
             break;
           }
@@ -1208,17 +1061,17 @@ function _isNetworkMatchedForTransaction() {
   }));
   return _isNetworkMatchedForTransaction.apply(this, arguments);
 }
-var getCurrentAddressOf = function getCurrentAddressOf(swap, step) {
-  var _step$evmTransaction, _step$evmApprovalTran, _step$cosmosTransacti, _step$solanaTransacti, _step$transferTransac, _step$transferTransac2;
-  var result = swap.wallets[((_step$evmTransaction = step.evmTransaction) == null ? void 0 : _step$evmTransaction.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti.blockChain) || ''] || swap.wallets[((_step$solanaTransacti = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti.blockChain) || ''] || ((_step$transferTransac = step.transferTransaction) != null && _step$transferTransac.fromWalletAddress ? {
+var getCurrentAddressOf$1 = function getCurrentAddressOf(swap, step) {
+  var _step$evmTransaction, _step$evmApprovalTran, _step$tronTransaction, _step$tronApprovalTra, _step$starknetTransac, _step$starknetApprova, _step$cosmosTransacti, _step$solanaTransacti, _step$transferTransac, _step$transferTransac2;
+  var result = swap.wallets[((_step$evmTransaction = step.evmTransaction) == null ? void 0 : _step$evmTransaction.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran.blockChain) || ''] || swap.wallets[((_step$tronTransaction = step.tronTransaction) == null ? void 0 : _step$tronTransaction.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra.blockChain) || ''] || swap.wallets[((_step$starknetTransac = step.starknetTransaction) == null ? void 0 : _step$starknetTransac.blockChain) || ''] || swap.wallets[((_step$starknetApprova = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti.blockChain) || ''] || swap.wallets[((_step$solanaTransacti = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti.blockChain) || ''] || ((_step$transferTransac = step.transferTransaction) != null && _step$transferTransac.fromWalletAddress ? {
     address: (_step$transferTransac2 = step.transferTransaction) == null ? void 0 : _step$transferTransac2.fromWalletAddress
   } : null) || null;
   if (result == null) throw PrettyError.WalletMissing();
   return result.address;
 };
 // Todo: Is it same with `getRequiredWallet`?
-function getRelatedWallet(swap, currentStep) {
-  var walletAddress = getCurrentAddressOf(swap, currentStep);
+function getRelatedWallet$1(swap, currentStep) {
+  var walletAddress = getCurrentAddressOf$1(swap, currentStep);
   var walletKV = Object.keys(swap.wallets).map(function (k) {
     return {
       k: k,
@@ -1231,12 +1084,12 @@ 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 to transfer: walletType: " + walletType);
+  if (walletType === WalletType.UNKNOWN || wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed: walletType: " + walletType);
   return wallet;
 }
 var isTxAlreadyCreated = function isTxAlreadyCreated(swap, step) {
-  var _step$evmTransaction2, _step$evmApprovalTran2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac3;
-  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac3 = step.transferTransaction) == null ? void 0 : _step$transferTransac3.fromWalletAddress) || null;
+  var _step$evmTransaction2, _step$evmApprovalTran2, _step$tronTransaction2, _step$tronApprovalTra2, _step$starknetTransac2, _step$starknetApprova2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac3;
+  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$tronTransaction2 = step.tronTransaction) == null ? void 0 : _step$tronTransaction2.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra2 = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra2.blockChain) || ''] || swap.wallets[((_step$starknetTransac2 = step.starknetTransaction) == null ? void 0 : _step$starknetTransac2.blockChain) || ''] || swap.wallets[((_step$starknetApprova2 = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac3 = step.transferTransaction) == null ? void 0 : _step$transferTransac3.fromWalletAddress) || null;
   return result !== null;
 };
 function resetNetworkStatus(actions) {
@@ -1433,8 +1286,13 @@ function singTransaction(actions) {
     evmApprovalTransaction = currentStep.evmApprovalTransaction,
     cosmosTransaction = currentStep.cosmosTransaction,
     solanaTransaction = currentStep.solanaTransaction,
-    transferTransaction = currentStep.transferTransaction;
-  var sourceWallet = getRelatedWallet(swap, currentStep);
+    transferTransaction = currentStep.transferTransaction,
+    tronTransaction = currentStep.tronTransaction,
+    tronApprovalTransaction = currentStep.tronApprovalTransaction,
+    starknetTransaction = currentStep.starknetTransaction,
+    starknetApprovalTransaction = currentStep.starknetApprovalTransaction;
+  var sourceWallet = getRelatedWallet$1(swap, currentStep);
+  var walletAddress = getCurrentAddressOf$1(swap, currentStep);
   var walletSigners = getSigners(sourceWallet.walletType);
   var onFinish = function onFinish() {
     if (actions.context.resetClaimedBy) {
@@ -1457,7 +1315,7 @@ function singTransaction(actions) {
       eventType: 'confirm_contract'
     }, updateResult));
     // Execute transaction
-    walletSigners.executeEvmTransaction(evmApprovalTransaction, meta).then(function (hash) {
+    walletSigners.getSigner(TransactionType.EVM).signAndSendTx(evmApprovalTransaction, walletAddress, null).then(function (hash) {
       console.debug('transaction of approval minted successfully', hash);
       var approveUrl = getEvmApproveUrl(hash, getCurrentBlockchainOf(swap, currentStep), meta.evmBasedChains);
       currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
@@ -1498,11 +1356,121 @@ function singTransaction(actions) {
       onFinish();
     });
     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 _updateResult = updateSwapStatus({
+      getStorage: getStorage,
+      setStorage: setStorage,
+      nextStepStatus: 'waitingForApproval',
+      message: _message,
+      details: 'Waiting for approve transaction to be mined and confirmed successfully'
+    });
+    notifier(_extends({
+      eventType: 'confirm_contract'
+    }, _updateResult));
+    // Execute transaction
+    walletSigners.getSigner(TransactionType.TRON).signAndSendTx(tronApprovalTransaction, walletAddress, null).then(function (hash) {
+      console.debug('transaction of approval minted successfully', hash);
+      var approveUrl = getTronApproveUrl(hash);
+      currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+        url: approveUrl,
+        description: "approve"
+      }]);
+      // `currentStep` has been mutated, let's update storage.
+      setStorage(_extends({}, getStorage(), {
+        swapDetails: swap
+      }));
+      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+      next();
+      onFinish();
+    }, function (error) {
+      var _error$root4, _error$root5, _error$root6;
+      if (swap.status === 'failed') return;
+      console.debug('error in approving', error);
+      var _prettifyErrorMessage2 = prettifyErrorMessage(error),
+        extraMessage = _prettifyErrorMessage2.extraMessage,
+        extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail,
+        extraMessageErrorCode = _prettifyErrorMessage2.extraMessageErrorCode;
+      if (error && error != null && error.root && error != null && (_error$root4 = error.root) != null && _error$root4.message && error != null && (_error$root5 = error.root) != null && _error$root5.code && error != null && (_error$root6 = error.root) != null && _error$root6.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: 'contract_rejected'
+      }, updateResult));
+      failed();
+      onFinish();
+    });
+    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 _updateResult2 = updateSwapStatus({
+      getStorage: getStorage,
+      setStorage: setStorage,
+      nextStepStatus: 'waitingForApproval',
+      message: _message2,
+      details: 'Waiting for approve transaction to be mined and confirmed successfully'
+    });
+    notifier(_extends({
+      eventType: 'confirm_contract'
+    }, _updateResult2));
+    // Execute transaction
+    walletSigners.getSigner(TransactionType.STARKNET).signAndSendTx(starknetApprovalTransaction, walletAddress, null).then(function (hash) {
+      console.debug('transaction of approval minted successfully', hash);
+      var approveUrl = getStarknetApproveUrl(hash);
+      currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+        url: approveUrl,
+        description: "approve"
+      }]);
+      // `currentStep` has been mutated, let's update storage.
+      setStorage(_extends({}, getStorage(), {
+        swapDetails: swap
+      }));
+      schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+      next();
+      onFinish();
+    }, function (error) {
+      var _error$root7, _error$root8, _error$root9;
+      if (swap.status === 'failed') return;
+      console.debug('error in approving', error);
+      var _prettifyErrorMessage3 = prettifyErrorMessage(error),
+        extraMessage = _prettifyErrorMessage3.extraMessage,
+        extraMessageDetail = _prettifyErrorMessage3.extraMessageDetail,
+        extraMessageErrorCode = _prettifyErrorMessage3.extraMessageErrorCode;
+      if (error && error != null && error.root && error != null && (_error$root7 = error.root) != null && _error$root7.message && error != null && (_error$root8 = error.root) != null && _error$root8.code && error != null && (_error$root9 = error.root) != null && _error$root9.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: 'contract_rejected'
+      }, updateResult));
+      failed();
+      onFinish();
+    });
+    return;
   }
   var executeMessage = 'executing transaction';
   var executeDetails = "" + (sourceWallet.walletType === WalletType.WALLET_CONNECT ? 'Check your mobile phone' : '');
   if (!!transferTransaction) {
-    var _updateResult = updateSwapStatus({
+    var _updateResult3 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: 'running',
@@ -1511,18 +1479,18 @@ function singTransaction(actions) {
     });
     notifier(_extends({
       eventType: 'confirm_transfer'
-    }, _updateResult));
-    walletSigners.executeTransfer(transferTransaction, meta).then(function (txId) {
+    }, _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 _prettifyErrorMessage2 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage2.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage2.extraMessageErrorCode;
+      var _prettifyErrorMessage4 = prettifyErrorMessage(error),
+        extraMessage = _prettifyErrorMessage4.extraMessage,
+        extraMessageDetail = _prettifyErrorMessage4.extraMessageDetail,
+        extraMessageErrorCode = _prettifyErrorMessage4.extraMessageErrorCode;
       var updateResult = updateSwapStatus({
         getStorage: getStorage,
         setStorage: setStorage,
@@ -1539,7 +1507,7 @@ function singTransaction(actions) {
       onFinish();
     });
   } else if (!!evmTransaction) {
-    var _updateResult2 = updateSwapStatus({
+    var _updateResult4 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: 'running',
@@ -1548,20 +1516,20 @@ function singTransaction(actions) {
     });
     notifier(_extends({
       eventType: 'calling_smart_contract'
-    }, _updateResult2));
-    walletSigners.executeEvmTransaction(evmTransaction, meta).then(function (id) {
+    }, _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$root4, _error$root5, _error$root6;
+      var _error$root10, _error$root11, _error$root12;
       if (swap.status === 'failed') return;
-      var _prettifyErrorMessage3 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage3.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage3.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage3.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root4 = error.root) != null && _error$root4.message && error != null && (_error$root5 = error.root) != null && _error$root5.code && error != null && (_error$root6 = error.root) != null && _error$root6.reason) {
+      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({
@@ -1580,7 +1548,7 @@ function singTransaction(actions) {
       onFinish();
     });
   } else if (!!cosmosTransaction) {
-    var _updateResult3 = updateSwapStatus({
+    var _updateResult5 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: 'running',
@@ -1589,16 +1557,16 @@ function singTransaction(actions) {
     });
     notifier(_extends({
       eventType: 'calling_smart_contract'
-    }, _updateResult3));
+    }, _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 _prettifyErrorMessage4 = 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 = _prettifyErrorMessage4.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage4.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage4.extraMessageErrorCode;
-      var _updateResult4 = updateSwapStatus({
+      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',
@@ -1609,12 +1577,12 @@ function singTransaction(actions) {
       });
       notifier(_extends({
         eventType: 'smart_contract_call_failed'
-      }, _updateResult4));
+      }, _updateResult6));
       failed();
       onFinish();
       return;
     }
-    walletSigners.executeCosmosMessage(cosmosTransaction, meta).then(
+    walletSigners.getSigner(TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
     // todo
     function (id) {
       setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
@@ -1623,10 +1591,10 @@ function singTransaction(actions) {
       onFinish();
     }, function (error) {
       if (swap.status === 'failed') return;
-      var _prettifyErrorMessage5 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage5.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage5.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage5.extraMessageErrorCode;
+      var _prettifyErrorMessage7 = prettifyErrorMessage(error),
+        extraMessage = _prettifyErrorMessage7.extraMessage,
+        extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
+        extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
       var updateResult = updateSwapStatus({
         getStorage: getStorage,
         setStorage: setStorage,
@@ -1643,7 +1611,7 @@ function singTransaction(actions) {
       onFinish();
     });
   } else if (!!solanaTransaction) {
-    var _updateResult5 = updateSwapStatus({
+    var _updateResult7 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
       nextStepStatus: 'running',
@@ -1652,19 +1620,101 @@ function singTransaction(actions) {
     });
     notifier(_extends({
       eventType: 'calling_smart_contract'
-    }, _updateResult5));
+    }, _updateResult7));
     var tx = solanaTransaction;
-    walletSigners.executeSolanaTransaction(tx, swap.requestId).then(function (txId) {
+    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 _prettifyErrorMessage6 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage6.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage6.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage6.extraMessageErrorCode;
+      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();
+    });
+  } else if (!!tronTransaction) {
+    var _updateResult8 = updateSwapStatus({
+      getStorage: getStorage,
+      setStorage: setStorage,
+      nextStepStatus: 'running',
+      message: executeMessage,
+      details: executeDetails
+    });
+    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));
+      failed();
+      onFinish();
+    });
+  } else if (!!starknetTransaction) {
+    var _updateResult9 = updateSwapStatus({
+      getStorage: getStorage,
+      setStorage: setStorage,
+      nextStepStatus: 'running',
+      message: executeMessage,
+      details: executeDetails
+    });
+    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,
@@ -1778,7 +1828,11 @@ function _checkTransactionStatus() {
           status = null;
           _context.prev = 5;
           _context.next = 8;
-          return checkSwapStatus(swap.requestId, txId, currentStep.id);
+          return httpService.checkStatus({
+            requestId: swap.requestId,
+            txId: txId,
+            step: currentStep.id
+          });
         case 8:
           status = _context.sent;
           _context.next = 17;
@@ -1792,14 +1846,14 @@ function _checkTransactionStatus() {
           retry();
           return _context.abrupt("return");
         case 17:
-          outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (!!currentStep.outputAmount ? new BigNumber$1(currentStep.outputAmount) : null);
+          outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (!!currentStep.outputAmount ? currentStep.outputAmount : null);
           prevOutputAmount = currentStep.outputAmount;
           swap.extraMessage = ((_status2 = status) == null ? void 0 : _status2.extraMessage) || swap.extraMessage;
           swap.extraMessageSeverity = MessageSeverity.info;
           swap.extraMessageDetail = '';
           currentStep.status = ((_status3 = status) == null ? void 0 : _status3.status) || currentStep.status;
           currentStep.diagnosisUrl = ((_status4 = status) == null ? void 0 : _status4.diagnosisUrl) || currentStep.diagnosisUrl || null;
-          currentStep.outputAmount = (outputAmount == null ? void 0 : outputAmount.toFixed()) || currentStep.outputAmount;
+          currentStep.outputAmount = outputAmount || currentStep.outputAmount;
           currentStep.explorerUrl = ((_status5 = status) == null ? void 0 : _status5.explorerUrl) || currentStep.explorerUrl;
           currentStep.internalSteps = ((_status6 = status) == null ? void 0 : _status6.steps) || null;
           newTransaction = (_status7 = status) == null ? void 0 : _status7.newTx;
@@ -1887,19 +1941,20 @@ function _checkApprovalStatus() {
           isApproved = false;
           _context2.prev = 4;
           _context2.next = 7;
-          return checkApproved(swap.requestId);
+          return httpService.checkApproval(swap.requestId);
         case 7:
           response = _context2.sent;
           isApproved = response.isApproved;
-          _context2.next = 14;
+          _context2.next = 15;
           break;
         case 11:
           _context2.prev = 11;
           _context2.t0 = _context2["catch"](4);
           console.error('Failed to check getApprovedAmount', _context2.t0);
-        case 14:
+          isApproved = false;
+        case 15:
           if (!isApproved) {
-            _context2.next = 27;
+            _context2.next = 28;
             break;
           }
           currentStep.status = 'approved';
@@ -1918,14 +1973,14 @@ function _checkApprovalStatus() {
           });
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context2.next = 30;
+          _context2.next = 31;
           break;
-        case 27:
-          _context2.next = 29;
+        case 28:
+          _context2.next = 30;
           return delay(2000);
-        case 29:
-          retry();
         case 30:
+          retry();
+        case 31:
         case "end":
           return _context2.stop();
       }
@@ -1978,20 +2033,20 @@ function _checkStatus() {
  * It can be failed if server goes through an error, If not, we will schedule the `EXECTUTE_TRANSACTION`.
  *
  */
-function createTransaction$1(_x) {
-  return _createTransaction$1.apply(this, arguments);
+function createTransaction(_x) {
+  return _createTransaction.apply(this, arguments);
 }
-function _createTransaction$1() {
-  _createTransaction$1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actions) {
-    var setStorage, getStorage, next, schedule, context, swap, currentStep, evmTransaction, cosmosTransaction, transferTransaction, evmApprovalTransaction, solanaTransaction, request, _yield$requestTransac, transaction, _prettifyErrorMessage, extraMessage, extraMessageDetail, updateResult;
+function _createTransaction() {
+  _createTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actions) {
+    var setStorage, getStorage, next, schedule, context, swap, currentStep, evmTransaction, cosmosTransaction, transferTransaction, evmApprovalTransaction, solanaTransaction, tronTransaction, tronApprovalTransaction, starknetTransaction, starknetApprovalTransaction, request, _yield$httpService$cr, transaction, _prettifyErrorMessage, extraMessage, extraMessageDetail, updateResult;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setStorage = actions.setStorage, getStorage = actions.getStorage, next = actions.next, schedule = actions.schedule, context = actions.context;
           swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
-          evmTransaction = currentStep.evmTransaction, cosmosTransaction = currentStep.cosmosTransaction, transferTransaction = currentStep.transferTransaction, evmApprovalTransaction = currentStep.evmApprovalTransaction, solanaTransaction = currentStep.solanaTransaction;
-          if (!(!evmTransaction && !cosmosTransaction && !transferTransaction && !evmApprovalTransaction && !solanaTransaction)) {
+          evmTransaction = currentStep.evmTransaction, cosmosTransaction = currentStep.cosmosTransaction, transferTransaction = currentStep.transferTransaction, evmApprovalTransaction = currentStep.evmApprovalTransaction, solanaTransaction = currentStep.solanaTransaction, tronTransaction = currentStep.tronTransaction, tronApprovalTransaction = currentStep.tronApprovalTransaction, starknetTransaction = currentStep.starknetTransaction, starknetApprovalTransaction = currentStep.starknetApprovalTransaction;
+          if (!(!evmTransaction && !evmApprovalTransaction && !tronTransaction && !tronApprovalTransaction && !starknetTransaction && !starknetApprovalTransaction && !cosmosTransaction && !transferTransaction && !solanaTransaction)) {
             _context.next = 25;
             break;
           }
@@ -2009,10 +2064,10 @@ function _createTransaction$1() {
           };
           _context.prev = 6;
           _context.next = 9;
-          return createTransaction(request);
+          return httpService.createTransaction(request);
         case 9:
-          _yield$requestTransac = _context.sent;
-          transaction = _yield$requestTransac.transaction;
+          _yield$httpService$cr = _context.sent;
+          transaction = _yield$httpService$cr.transaction;
           if (transaction) {
             if (isEvmTransaction(transaction)) {
               if (transaction.isApprovalTx) currentStep.evmApprovalTransaction = transaction;else currentStep.evmTransaction = transaction;
@@ -2022,6 +2077,10 @@ function _createTransaction$1() {
               currentStep.solanaTransaction = transaction;
             } else if (isTrasnferTransaction(transaction)) {
               currentStep.transferTransaction = transaction;
+            } else if (isStarknetTransaction(transaction)) {
+              if (transaction.isApprovalTx) currentStep.starknetApprovalTransaction = transaction;else currentStep.starknetTransaction = transaction;
+            } else if (isTronTransaction(transaction)) {
+              if (transaction.isApprovalTx) currentStep.tronApprovalTransaction = transaction;else currentStep.tronTransaction = transaction;
             }
           }
           setStorage(_extends({}, getStorage(), {
@@ -2056,7 +2115,7 @@ function _createTransaction$1() {
       }
     }, _callee, null, [[6, 17]]);
   }));
-  return _createTransaction$1.apply(this, arguments);
+  return _createTransaction.apply(this, arguments);
 }
 
 /**
@@ -2225,7 +2284,7 @@ var _actions;
  */
 var swapQueueDef = {
   name: 'swap',
-  actions: (_actions = {}, _actions[SwapActionTypes.START] = start, _actions[SwapActionTypes.SCHEDULE_NEXT_STEP] = scheduleNextStep, _actions[SwapActionTypes.CREATE_TRANSACTION] = createTransaction$1, _actions[SwapActionTypes.EXECUTE_TRANSACTION] = executeTransaction, _actions[SwapActionTypes.CHECK_TRANSACTION_STATUS] = checkStatus, _actions),
+  actions: (_actions = {}, _actions[SwapActionTypes.START] = start, _actions[SwapActionTypes.SCHEDULE_NEXT_STEP] = scheduleNextStep, _actions[SwapActionTypes.CREATE_TRANSACTION] = createTransaction, _actions[SwapActionTypes.EXECUTE_TRANSACTION] = executeTransaction, _actions[SwapActionTypes.CHECK_TRANSACTION_STATUS] = checkStatus, _actions),
   run: [SwapActionTypes.START],
   whenTaskBlocked: function whenTaskBlocked(event, meta) {
     if (event.reason.reason === BlockReason.WAIT_FOR_CONNECT_WALLET) {