@rango-dev/queue-manager-rango-preset 0.1.10-next.94 → 0.1.10-next.96

package/package.json

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

package/src/actions/checkStatus.ts

@@ -1,4 +1,5 @@
 import { ExecuterActions } from '@rango-dev/queue-manager-core';
+import { Network } from '@rango-dev/wallets-shared';
 import {
   delay,
   getCurrentStep,
@@ -81,6 +82,7 @@ async function checkTransactionStatus({
     currentStep.starknetTransaction = null;
     currentStep.tronApprovalTransaction = null;
     currentStep.tronTransaction = null;
+    currentStep.fromBlockchain = newTransaction.blockChain as Network;
 
     if (isEvmTransaction(newTransaction)) {
       if (newTransaction.isApprovalTx)

package/src/actions/executeTransaction.ts

@@ -57,9 +57,13 @@ export async function executeTransaction(
   const isWrongAddress = !isRequiredWalletConnected(swap, context.state);
   if (isWrongAddress) {
     const { type, address } = getRequiredWallet(swap);
-    const description = !wallets
-      ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type)
-      : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
+    const isWalletInCompatible = wallets?.blockchains?.find(
+      (w) => !w.accounts?.find((account) => account.walletType === type)
+    );
+    const description =
+      !wallets || isWalletInCompatible
+        ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type)
+        : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
 
     const blockedFor = {
       reason: BlockReason.WAIT_FOR_CONNECT_WALLET,

package/src/helpers.ts

@@ -87,6 +87,16 @@ function claimQueue() {
   };
 }
 
+/**
+ *
+ * Returns "wallet and network" separately, even if the wallet is dashed inside.
+ *
+ */
+
+function splitWalletNetwork(input: string): string[] {
+  return input?.split(/-(?=[^-]*$)/);
+}
+
 /**
  *
  * Returns `steps`, if it's a `running` swap.
@@ -1107,7 +1117,10 @@ export function singTransaction(
     const notification = getSwapNotitfication('confirm_transfer', updateResult);
     notifier(notification);
 
-    if (notification.eventType !== 'transaction_expired') {
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       walletSigners
         .getSigner(TransactionType.TRANSFER)
         .signAndSendTx(transferTransaction, walletAddress, null)
@@ -1161,7 +1174,10 @@ export function singTransaction(
     );
     notifier(notification);
 
-    if (notification.eventType !== 'transaction_expired') {
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       walletSigners
         .getSigner(TransactionType.EVM)
         .signAndSendTx(evmTransaction, walletAddress, null)
@@ -1230,7 +1246,10 @@ export function singTransaction(
     );
     notifier(notification);
 
-    if (notification.eventType !== 'transaction_expired') {
+    if (notification.eventType === 'transaction_expired') {
+      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?.swapperId.toString() === 'TerraSwap' ||
@@ -1317,7 +1336,10 @@ export function singTransaction(
     );
     notifier(notification);
 
-    if (notification.eventType !== 'transaction_expired') {
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
       const tx = solanaTransaction;
       walletSigners
         .getSigner(TransactionType.SOLANA)
@@ -1360,120 +1382,146 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: 'running',
+      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
       message: executeMessage,
       details: executeDetails,
+      hasAlreadyProceededToSign,
     });
-    notifier({
-      eventType: 'calling_smart_contract',
-      ...updateResult,
-    });
+    const notification = getSwapNotitfication(
+      'calling_smart_contract',
+      updateResult
+    );
+    notifier(notification);
 
-    walletSigners
-      .getSigner(TransactionType.TRON)
-      .signAndSendTx(tronTransaction, walletAddress, null)
-      .then(
-        (id) => {
-          setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-          schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-          next();
-          onFinish();
-        },
-        (error) => {
-          if (swap.status === 'failed') return;
-          const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
-            prettifyErrorMessage(error);
-          if (
-            error &&
-            error?.root &&
-            error?.root?.message &&
-            error?.root?.code &&
-            error?.root?.reason
-          ) {
-            logRPCError(
-              error.root,
-              swap,
-              currentStep,
-              sourceWallet?.walletType
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
+      walletSigners
+        .getSigner(TransactionType.TRON)
+        .signAndSendTx(tronTransaction, walletAddress, null)
+        .then(
+          (id) => {
+            setStepTransactionIds(
+              actions,
+              id,
+              'smart_contract_called',
+              notifier
             );
-          }
-          const updateResult = updateSwapStatus({
-            getStorage,
-            setStorage,
-            nextStatus: 'failed',
-            nextStepStatus: 'failed',
-            message: extraMessage,
-            details: extraMessageDetail,
-            errorCode: extraMessageErrorCode,
-          });
-          notifier({
-            eventType: 'smart_contract_call_failed',
-            ...updateResult,
-          });
+            schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+            next();
+            onFinish();
+          },
+          (error) => {
+            if (swap.status === 'failed') return;
+            const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
+              prettifyErrorMessage(error);
+            if (
+              error &&
+              error?.root &&
+              error?.root?.message &&
+              error?.root?.code &&
+              error?.root?.reason
+            ) {
+              logRPCError(
+                error.root,
+                swap,
+                currentStep,
+                sourceWallet?.walletType
+              );
+            }
+            const updateResult = updateSwapStatus({
+              getStorage,
+              setStorage,
+              nextStatus: 'failed',
+              nextStepStatus: 'failed',
+              message: extraMessage,
+              details: extraMessageDetail,
+              errorCode: extraMessageErrorCode,
+            });
+            notifier({
+              eventType: 'smart_contract_call_failed',
+              ...updateResult,
+            });
 
-          failed();
-          onFinish();
-        }
-      );
+            failed();
+            onFinish();
+          }
+        );
+    }
   } else if (!!starknetTransaction) {
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: 'running',
+      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
       message: executeMessage,
       details: executeDetails,
+      hasAlreadyProceededToSign,
     });
-    notifier({
-      eventType: 'calling_smart_contract',
-      ...updateResult,
-    });
+    const notification = getSwapNotitfication(
+      'calling_smart_contract',
+      updateResult
+    );
+    notifier(notification);
 
-    walletSigners
-      .getSigner(TransactionType.STARKNET)
-      .signAndSendTx(starknetTransaction, walletAddress, null)
-      .then(
-        (id) => {
-          setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
-          schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-          next();
-          onFinish();
-        },
-        (error) => {
-          if (swap.status === 'failed') return;
-          const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
-            prettifyErrorMessage(error);
-          if (
-            error &&
-            error?.root &&
-            error?.root?.message &&
-            error?.root?.code &&
-            error?.root?.reason
-          ) {
-            logRPCError(
-              error.root,
-              swap,
-              currentStep,
-              sourceWallet?.walletType
+    if (notification.eventType === 'transaction_expired') {
+      failed();
+      onFinish();
+    } else {
+      walletSigners
+        .getSigner(TransactionType.STARKNET)
+        .signAndSendTx(starknetTransaction, walletAddress, null)
+        .then(
+          (id) => {
+            setStepTransactionIds(
+              actions,
+              id,
+              'smart_contract_called',
+              notifier
             );
-          }
-          const updateResult = updateSwapStatus({
-            getStorage,
-            setStorage,
-            nextStatus: 'failed',
-            nextStepStatus: 'failed',
-            message: extraMessage,
-            details: extraMessageDetail,
-            errorCode: extraMessageErrorCode,
-          });
-          notifier({
-            eventType: 'smart_contract_call_failed',
-            ...updateResult,
-          });
+            schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+            next();
+            onFinish();
+          },
+          (error) => {
+            if (swap.status === 'failed') return;
+            const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
+              prettifyErrorMessage(error);
+            if (
+              error &&
+              error?.root &&
+              error?.root?.message &&
+              error?.root?.code &&
+              error?.root?.reason
+            ) {
+              logRPCError(
+                error.root,
+                swap,
+                currentStep,
+                sourceWallet?.walletType
+              );
+            }
+            const updateResult = updateSwapStatus({
+              getStorage,
+              setStorage,
+              nextStatus: 'failed',
+              nextStepStatus: 'failed',
+              message: extraMessage,
+              details: extraMessageDetail,
+              errorCode: extraMessageErrorCode,
+            });
+            notifier({
+              eventType: 'smart_contract_call_failed',
+              ...updateResult,
+            });
 
-          failed();
-          onFinish();
-        }
-      );
+            failed();
+            onFinish();
+          }
+        );
+    }
   }
 }
 
@@ -1483,8 +1531,7 @@ export function checkWaitingForConnectWalletChange(params: {
   evmChains: EvmBlockchainMeta[];
 }): void {
   const { wallet_network, evmChains, manager } = params;
-  const [wallet, network] = wallet_network.split('-');
-
+  const [wallet, network] = splitWalletNetwork(wallet_network);
   // We only need change network for EVM chains.
   if (!evmChains.some((chain) => chain.name == network)) return;
 
@@ -1509,7 +1556,11 @@ export function checkWaitingForConnectWalletChange(params: {
           }
         );
 
-        if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
+        if (
+          currentStepRequiredWallet === wallet &&
+          hasWaitingForConnect &&
+          getCurrentBlockchainOfOrNull(swap, currentStep) != network
+        ) {
           const queueInstance = q.list;
           const { type } = getRequiredWallet(swap);
           const description = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(type);
@@ -1582,7 +1633,7 @@ export function retryOn(
   manager?: Manager,
   options = { fallbackToOnlyWallet: true }
 ): void {
-  const [wallet, network] = wallet_network.split('-');
+  const [wallet, network] = splitWalletNetwork(wallet_network);
   if (!wallet || !network) {
     return;
   }