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

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

@@ -1,7 +1,9 @@
 import BigNumber$1, { BigNumber } from 'bignumber.js';
-import { WalletError, isWalletErrorCode, WalletErrorCode, TransactionType, getBlockChainNameFromId, WalletType, Network } from '@rango-dev/wallets-shared';
+import { getBlockChainNameFromId, WalletType, Network } from '@rango-dev/wallets-shared';
 import { readAccountAddress } from '@rango-dev/wallets-core';
+import { TransactionType } from 'rango-sdk';
 import { Status } from '@rango-dev/queue-manager-core';
+import { SignerError, isSignerErrorCode, SignerErrorCode } from 'rango-types';
 import { captureException } from '@sentry/browser';
 
 var SwapActionTypes;
@@ -581,7 +583,7 @@ var prettifyErrorMessage = function prettifyErrorMessage(obj) {
     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,
@@ -792,9 +794,9 @@ function mapAppErrorCodesToAPIErrorCode(errorCode) {
   try {
     if (!errorCode) return defaultErrorCode;
     if (isAPIErrorCode(errorCode)) return errorCode;
-    if (isWalletErrorCode(errorCode)) {
+    if (isSignerErrorCode(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);
+      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;
@@ -1231,7 +1233,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 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) {
@@ -1435,6 +1437,7 @@ function singTransaction(actions) {
     solanaTransaction = currentStep.solanaTransaction,
     transferTransaction = currentStep.transferTransaction;
   var sourceWallet = getRelatedWallet(swap, currentStep);
+  var walletAddress = getCurrentAddressOf(swap, currentStep);
   var walletSigners = getSigners(sourceWallet.walletType);
   var onFinish = function onFinish() {
     if (actions.context.resetClaimedBy) {
@@ -1457,7 +1460,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 || [], [{
@@ -1512,7 +1515,7 @@ function singTransaction(actions) {
     notifier(_extends({
       eventType: 'confirm_transfer'
     }, _updateResult));
-    walletSigners.executeTransfer(transferTransaction, meta).then(function (txId) {
+    walletSigners.getSigner(TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
       setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
@@ -1549,7 +1552,7 @@ function singTransaction(actions) {
     notifier(_extends({
       eventType: 'calling_smart_contract'
     }, _updateResult2));
-    walletSigners.executeEvmTransaction(evmTransaction, meta).then(function (id) {
+    walletSigners.getSigner(TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
       setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
@@ -1614,7 +1617,7 @@ function singTransaction(actions) {
       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);
@@ -1654,7 +1657,7 @@ function singTransaction(actions) {
       eventType: 'calling_smart_contract'
     }, _updateResult5));
     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();