@rango-dev/queue-manager-rango-preset 0.1.10-next.102 → 0.1.10-next.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.10-next.102",
+  "version": "0.1.10-next.104",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/actions/checkStatus.ts

@@ -209,7 +209,6 @@ async function checkApprovalStatus({
       });
     }
   } catch (e) {
-    console.error('Failed to check getApprovedAmount', e);
     isApproved = false;
   }
   if (isApproved) {

package/src/actions/executeTransaction.ts

@@ -79,7 +79,7 @@ export async function executeTransaction(
   */
   const needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
 
-  if (needsToBlockQueue && !isClaimed && context.claimedBy) {
+  if (needsToBlockQueue && !isClaimed) {
     const blockedFor = {
       reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
       description: 'Waiting for other swaps to complete',

package/src/helpers.ts

@@ -510,7 +510,6 @@ export async function isNetworkMatchedForTransaction(
   providers: Providers
 ): Promise<boolean> {
   if (isWalletNull(wallet)) {
-    console.warn('wallet object is null');
     return false;
   }
   const fromBlockChain = getCurrentBlockchainOfOrNull(swap, step);
@@ -746,6 +745,8 @@ export function onDependsOnOtherQueues(
   const claimerId = claimedBy();
   const isClaimedByAnyQueue = !!claimerId;
 
+  if (claimerId === queue.id) return;
+
   // Check if any queue `claimed` before, if yes, we don't should do anything.
   if (isClaimedByAnyQueue) {
     // We need to keep the latest swap messages
@@ -781,7 +782,7 @@ export function onDependsOnOtherQueues(
     resetClaimedBy: () => {
       reset();
       // TODO: Use key generator
-      retryOn(`${type}-${network}-${address}`, context.notifier, manager);
+      retryOn(`${type}-${network}:${address}`, context.notifier, manager);
     },
   });
 }
@@ -869,7 +870,6 @@ export function singTransaction(
       .signAndSendTx(evmApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getEvmApproveUrl(
             hash,
             getCurrentBlockchainOf(swap, currentStep),
@@ -889,7 +889,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (
@@ -952,7 +952,6 @@ export function singTransaction(
       .signAndSendTx(tronApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getTronApproveUrl(hash);
           setStepTransactionIds(
             actions,
@@ -968,7 +967,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (
@@ -1031,7 +1030,6 @@ export function singTransaction(
       .signAndSendTx(starknetApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getStarknetApproveUrl(hash);
           setStepTransactionIds(
             actions,
@@ -1047,7 +1045,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (