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

package/dist/helpers.d.ts

@@ -1,8 +1,8 @@
 import { ExecuterActions } from '@rango-dev/queue-manager-core';
 import { SwapActionTypes, SwapQueueContext, SwapQueueDef, SwapStorage } from './types';
-import { EvmBlockchainMeta, Meta, Network, Transaction, WalletState, WalletType } from '@rango-dev/wallets-shared';
+import { Meta, Network, WalletState, WalletType } from '@rango-dev/wallets-shared';
 import { Providers } from '@rango-dev/wallets-core';
-import { TronTransaction, StarknetTransaction, CosmosTransaction, EvmTransaction, SolanaTransaction, Transfer as TransferTransaction } from 'rango-sdk';
+import { TronTransaction, StarknetTransaction, CosmosTransaction, EvmTransaction, SolanaTransaction, Transfer as TransferTransaction, Transaction, EvmBlockchainMeta } from 'rango-sdk';
 import { Manager } from '@rango-dev/queue-manager-core';
 import { EventType, PendingSwap, PendingSwapNetworkStatus, PendingSwapStep, StepStatus, SwapStatus, Wallet, WalletTypeAndAddress } from './shared';
 declare type WhenTaskBlocked = Parameters<NonNullable<SwapQueueDef['whenTaskBlocked']>>;

package/dist/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAa,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,iBAAiB,EAEjB,IAAI,EACJ,OAAO,EACP,WAAW,EAEX,WAAW,EACX,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAsB,MAAM,yBAAyB,CAAC;AAExE,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,QAAQ,IAAI,mBAAmB,EAChC,MAAM,WAAW,CAAC;AAOnB,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EACL,SAAS,EAMT,WAAW,EACX,wBAAwB,EACxB,eAAe,EAEf,UAAU,EACV,UAAU,EACV,MAAM,EACN,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAKlB,aAAK,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAChF,aAAK,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAC/C,aAAK,mBAAmB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAuB9C;;;;;GAKG;AACH,eAAO,MAAM,cAAc,SAAU,WAAW,KAAG,eAAe,GAAG,IAMpE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,UAAU,EACV,UAAU,EACV,UAAU,EACV,cAAc,EACd,OAAO,EACP,OAAO,EACP,SAAgB,GACjB,EAAE;IACD,UAAU,EAAE,eAAe,CACzB,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC,YAAY,CAAC,CAAC;IAChB,UAAU,EAAE,eAAe,CACzB,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC,YAAY,CAAC,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG;IACF,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;CAC9B,CAiDA;AAED,wBAAgB,qBAAqB,CACnC,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,EACzE,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,GACrC,IAAI,CAUN;AAED;;;GAGG;AACH,wBAAgB,2CAA2C,CACzD,EACE,UAAU,EACV,UAAU,GACX,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,YAAY,CAAC,EACrD,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,IAAI,CA0BN;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,EAChD,UAAU,EACV,UAAU,GACX,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,YAAY,CAAC,GACjD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,eAAe,CAAC;CACvB,GACD,SAAS,CA+BZ;AAED;;;GAGG;AACH,wBAAgB,qCAAqC,CAAC,EACpD,UAAU,EACV,UAAU,GACX,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,YAAY,CAAC,GACjD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,eAAe,CAAC;CACvB,GACD,SAAS,CAkBZ;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAElD;AAED,eAAO,MAAM,gBAAgB,OAAQ,WAAW,yBACf,CAAC;AAElC,eAAO,MAAM,mBAAmB,OAAQ,WAAW,4BACf,CAAC;AACrC,eAAO,MAAM,mBAAmB,OAAQ,WAAW,4BACf,CAAC;AACrC,eAAO,MAAM,qBAAqB,OAC5B,WAAW,8BACmD,CAAC;AACrE,eAAO,MAAM,qBAAqB,OAC5B,WAAW,8BACmD,CAAC;AACrE,eAAO,MAAM,iBAAiB,OAAQ,WAAW,0BACf,CAAC;AAEnC;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SACtB,WAAW,WACR,OAAO,KACf,UAEF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAM3D;AAED;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,GAAG,CAQ1E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG;IACpD,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAoBA;AAaD;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,eAAe,EACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC,CAiElB;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,SACxB,WAAW,QACX,eAAe,KACpB,MAYF,CAAC;AAGF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,eAAe,GAC3B,oBAAoB,CAetB;AAED,eAAO,MAAM,kBAAkB,SACvB,WAAW,QACX,eAAe,KACpB,OAUF,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,gBAAgB,CAAC,GACvE,IAAI,CASN;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,gBAAgB,CAAC,EACxE,IAAI,GAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,wBAAwB,GAAG,IAAI,CAAC;CAKzC,GACA,IAAI,CAYN;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,mBAAmB,GACxB,IAAI,CA0BN;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,IAAI,CA8BN;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,IAAI,CAqDN;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,GAC1C,OAAO,CAaT;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE,gBAAgB,CAAC,GACvE,IAAI,CAuUN;AAED,wBAAgB,kCAAkC,CAAC,MAAM,EAAE;IACzD,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,iBAAiB,EAAE,CAAC;CAChC,GAAG,IAAI,CAmDP;AAED,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CA8BpE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,OAAO,CACrB,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO;;CAAiC,GACvC,IAAI,CAsDN;AAMD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAM1E"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["src/helpers.ts"],"names":[],"mappings":"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"}

package/dist/queue-manager-rango-preset.cjs.development.js

@@ -8,7 +8,9 @@ var BigNumber = require('bignumber.js');
 var BigNumber__default = _interopDefault(BigNumber);
 var walletsShared = require('@rango-dev/wallets-shared');
 var walletsCore = require('@rango-dev/wallets-core');
+var rangoSdk = require('rango-sdk');
 var queueManagerCore = require('@rango-dev/queue-manager-core');
+var rangoTypes = require('rango-types');
 var Sentry = require('@sentry/browser');
 
 var SwapActionTypes;
@@ -588,7 +590,7 @@ var prettifyErrorMessage = function prettifyErrorMessage(obj) {
     extraMessageErrorCode: null
   };
   if (obj instanceof PrettyError) return obj.getErrorDetail();
-  if (obj instanceof walletsShared.WalletError) {
+  if (obj instanceof rangoTypes.SignerError) {
     var t = obj.getErrorDetail();
     return {
       extraMessage: t.message,
@@ -799,9 +801,9 @@ function mapAppErrorCodesToAPIErrorCode(errorCode) {
   try {
     if (!errorCode) return defaultErrorCode;
     if (isAPIErrorCode(errorCode)) return errorCode;
-    if (walletsShared.isWalletErrorCode(errorCode)) {
+    if (rangoTypes.isSignerErrorCode(errorCode)) {
       var _t;
-      var t = (_t = {}, _t[walletsShared.WalletErrorCode.REJECTED_BY_USER] = APIErrorCode.USER_REJECT, _t[walletsShared.WalletErrorCode.SIGN_TX_ERROR] = APIErrorCode.CALL_WALLET_FAILED, _t[walletsShared.WalletErrorCode.SEND_TX_ERROR] = APIErrorCode.SEND_TX_FAILED, _t[walletsShared.WalletErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[walletsShared.WalletErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[walletsShared.WalletErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
+      var t = (_t = {}, _t[rangoTypes.SignerErrorCode.REJECTED_BY_USER] = APIErrorCode.USER_REJECT, _t[rangoTypes.SignerErrorCode.SIGN_TX_ERROR] = APIErrorCode.CALL_WALLET_FAILED, _t[rangoTypes.SignerErrorCode.SEND_TX_ERROR] = APIErrorCode.SEND_TX_FAILED, _t[rangoTypes.SignerErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
       return t[errorCode];
     }
     return defaultErrorCode;
@@ -1011,22 +1013,22 @@ function delay(ms) {
   });
 }
 var isEvmTransaction = function isEvmTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.EVM;
+  return tx.type === rangoSdk.TransactionType.EVM;
 };
 var isCosmosTransaction = function isCosmosTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.COSMOS;
+  return tx.type === rangoSdk.TransactionType.COSMOS;
 };
 var isSolanaTransaction = function isSolanaTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.SOLANA;
+  return tx.type === rangoSdk.TransactionType.SOLANA;
 };
 var isTrasnferTransaction = function isTrasnferTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.TRANSFER;
+  return tx.type === rangoSdk.TransactionType.TRANSFER;
 };
 var isStarknetTransaction = function isStarknetTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.STARKNET;
+  return tx.type === rangoSdk.TransactionType.STARKNET;
 };
 var isTronTransaction = function isTronTransaction(tx) {
-  return tx.type === walletsShared.TransactionType.TRON;
+  return tx.type === rangoSdk.TransactionType.TRON;
 };
 /**
  *
@@ -1238,7 +1240,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 === walletsShared.WalletType.UNKNOWN || wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed to transfer: walletType: " + walletType);
+  if (walletType === walletsShared.WalletType.UNKNOWN || wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed: walletType: " + walletType);
   return wallet;
 }
 var isTxAlreadyCreated = function isTxAlreadyCreated(swap, step) {
@@ -1442,6 +1444,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) {
@@ -1464,7 +1467,7 @@ function singTransaction(actions) {
       eventType: 'confirm_contract'
     }, updateResult));
     // Execute transaction
-    walletSigners.executeEvmTransaction(evmApprovalTransaction, meta).then(function (hash) {
+    walletSigners.getSigner(rangoSdk.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 || [], [{
@@ -1519,7 +1522,7 @@ function singTransaction(actions) {
     notifier(_extends({
       eventType: 'confirm_transfer'
     }, _updateResult));
-    walletSigners.executeTransfer(transferTransaction, meta).then(function (txId) {
+    walletSigners.getSigner(rangoSdk.TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
       setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
@@ -1556,7 +1559,7 @@ function singTransaction(actions) {
     notifier(_extends({
       eventType: 'calling_smart_contract'
     }, _updateResult2));
-    walletSigners.executeEvmTransaction(evmTransaction, meta).then(function (id) {
+    walletSigners.getSigner(rangoSdk.TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
       setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
@@ -1621,7 +1624,7 @@ function singTransaction(actions) {
       onFinish();
       return;
     }
-    walletSigners.executeCosmosMessage(cosmosTransaction, meta).then(
+    walletSigners.getSigner(rangoSdk.TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
     // todo
     function (id) {
       setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
@@ -1661,7 +1664,7 @@ function singTransaction(actions) {
       eventType: 'calling_smart_contract'
     }, _updateResult5));
     var tx = solanaTransaction;
-    walletSigners.executeSolanaTransaction(tx, swap.requestId).then(function (txId) {
+    walletSigners.getSigner(rangoSdk.TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
       setStepTransactionIds(actions, txId, 'smart_contract_called', notifier);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();