@rango-dev/queue-manager-rango-preset 0.1.15-next.2 → 0.1.15-next.4

package/dist/shared.d.ts

@@ -1,5 +1,5 @@
 import { Network, WalletType } from '@rango-dev/wallets-shared';
-import { CosmosTransaction, EvmBlockchainMeta, EvmTransaction, SimulationResult, SolanaTransaction, StarknetTransaction, TronTransaction, Transfer as TransferTransaction, AmountRestrictionType, BestRouteResponse, MetaResponse, Token, SwapResult } from 'rango-sdk';
+import { CosmosTransaction, EvmTransaction, SimulationResult, SolanaTransaction, StarknetTransaction, TronTransaction, Transfer as TransferTransaction, AmountRestrictionType, BestRouteResponse, MetaResponse, Token, SwapResult, BlockchainMeta } from 'rango-sdk';
 import BigNumber from 'bignumber.js';
 export interface PendingSwapWithQueueID {
     id: string;
@@ -37,7 +37,7 @@ export declare type Blockchain = {
 export declare type Wallet = {
     blockchains: Blockchain[];
 };
-export declare type EventType = 'swap_started' | 'confirm_contract' | 'confirm_transfer' | 'task_failed' | 'task_completed' | 'task_canceled' | 'task_paused' | 'contract_confirmed' | 'confirm_approve_contract' | 'contract_rejected' | 'check_tx_status' | 'check_approve_tx_status' | 'transfer_rejected' | 'transfer_failed' | 'calling_smart_contract' | 'smart_contract_called' | 'smart_contract_call_failed' | 'step_completed_with_output' | 'waiting_for_network_change' | 'waiting_for_connecting_wallet' | 'waiting_for_change_wallet_account' | 'network_changed' | 'not_enough_balance' | 'waiting_for_queue' | 'check_fee_failed' | 'route_failed_to_find' | 'transaction_expired';
+export declare type EventType = 'swap_started' | 'confirm_contract' | 'confirm_transfer' | 'task_failed' | 'task_completed' | 'task_canceled' | 'task_paused' | 'contract_confirmed' | 'confirm_approve_contract' | 'contract_rejected' | 'check_tx_status' | 'check_approve_tx_status' | 'transfer_rejected' | 'transfer_failed' | 'calling_smart_contract' | 'smart_contract_called' | 'smart_contract_call_failed' | 'step_completed_with_output' | 'waiting_for_network_change' | 'waiting_for_connecting_wallet' | 'waiting_for_change_wallet_account' | 'network_changed' | 'not_enough_balance' | 'not_enough_approval' | 'waiting_for_queue' | 'check_fee_failed' | 'route_failed_to_find' | 'transaction_expired';
 export declare type SwapSavedSettings = {
     slippage: string;
     disabledSwappersIds?: string[];
@@ -140,9 +140,9 @@ export declare type PendingSwap = {
 };
 export declare const getCurrentBlockchainOfOrNull: (swap: PendingSwap, step: PendingSwapStep) => Network | null;
 export declare const getCurrentBlockchainOf: (swap: PendingSwap, step: PendingSwapStep) => Network;
-export declare const getEvmApproveUrl: (tx: string, network: Network, evmBasedBlockchains: EvmBlockchainMeta[]) => string;
-export declare const getStarknetApproveUrl: (tx: string) => string;
-export declare const getTronApproveUrl: (tx: string) => string;
+export declare const getScannerUrl: (txHash: string, network: Network, blockchainMetaMap: {
+    [key: string]: BlockchainMeta;
+}) => string | undefined;
 export declare function getNextStep(swap: PendingSwap, currentStep: PendingSwapStep): PendingSwapStep | null;
 /**
  * Returns the wallet address, based on the current step of `PendingSwap`.

package/dist/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["src/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["src/shared.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.15-next.2",
+  "version": "0.1.15-next.4",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",
@@ -10,7 +10,7 @@
     "src"
   ],
   "scripts": {
-    "dev": "tsdx watch",
+    "dev": "tsdx watch --tsconfig ./tsconfig.json",
     "build": "tsdx build --tsconfig ./tsconfig.json",
     "analyze": "size-limit --why",
     "clean": "rimraf dist",

package/src/actions/checkStatus.ts

@@ -2,21 +2,26 @@ import { ExecuterActions } from '@rango-dev/queue-manager-core';
 import {
   delay,
   getCurrentStep,
-  isCosmosTransaction,
-  isEvmTransaction,
-  isSolanaTransaction,
-  isStarknetTransaction,
-  isTrasnferTransaction,
-  isTronTransaction,
+  getCurrentStepTxType,
   resetNetworkStatus,
+  setCurrentStepTx,
   updateSwapStatus,
+  useTransactionsResponse,
 } from '../helpers';
 import { SwapActionTypes, SwapQueueContext, SwapStorage } from '../types';
-import { getNextStep, MessageSeverity } from '../shared';
-import { TransactionStatusResponse } from 'rango-sdk';
+import {
+  getCurrentBlockchainOf,
+  getNextStep,
+  getRelatedWallet,
+  getScannerUrl,
+  MessageSeverity,
+} from '../shared';
+import { Transaction, TransactionStatusResponse } from 'rango-sdk';
 import { httpService } from '../services';
+import { GenericSigner } from 'rango-types';
+import { prettifyErrorMessage } from '../shared-errors';
 
-const INTERVAL_FOR_CHECK = 3_000;
+const INTERVAL_FOR_CHECK = 5_000;
 
 /**
  * Subscribe to status of swap transaction by checking from server periodically.
@@ -30,17 +35,77 @@ async function checkTransactionStatus({
   retry,
   failed,
   context,
-}: ExecuterActions<
-  SwapStorage,
-  SwapActionTypes,
-  SwapQueueContext
->): Promise<void> {
+}: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>): Promise<void> {
   const swap = getStorage().swapDetails;
+  const { meta } = context;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
-  const txId = currentStep.executedTransactionId;
+  let txId = currentStep.executedTransactionId;
 
+  let getTxReceiptFailed = false;
   let status: TransactionStatusResponse | null = null;
+  let signer: GenericSigner<Transaction> | null = null;
+  const { getTransactionResponseByHash, setTransactionResponseByHash } = useTransactionsResponse();
+
+  try {
+    const txType = getCurrentStepTxType(currentStep);
+    const sourceWallet = getRelatedWallet(swap, currentStep);
+    if (txType && sourceWallet)
+      signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
+  } catch (error) {
+    // wallet is not connected yet
+    // no need to do anything
+  }
+
+  try {
+    // if wallet is connected, try to get transaction reciept
+    if (signer?.wait) {
+      const txResponse = getTransactionResponseByHash(txId!);
+      const { hash: updatedTxHash, response: updatedTxResponse } = await signer.wait(
+        txId!,
+        txResponse,
+      );
+      if (updatedTxHash !== txId) {
+        currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+        const currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
+        const explorerUrl = getScannerUrl(
+          currentStep.executedTransactionId!,
+          currentStepBlockchain,
+          meta.blockchains,
+        );
+        if (explorerUrl) {
+          if (currentStep.explorerUrl && currentStep.explorerUrl?.length >= 1) {
+            currentStep.explorerUrl[currentStep.explorerUrl.length - 1] = {
+              url: explorerUrl,
+              description: 'Replaced Swap',
+            };
+          }
+        }
+        txId = currentStep.executedTransactionId;
+        if (updatedTxHash && updatedTxResponse)
+          setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+      }
+    }
+  } catch (error) {
+    const { extraMessage, extraMessageDetail, extraMessageErrorCode } = prettifyErrorMessage(error);
+    const updateResult = updateSwapStatus({
+      getStorage,
+      setStorage,
+      nextStatus: 'failed',
+      nextStepStatus: 'failed',
+      message: extraMessage,
+      details: extraMessageDetail,
+      errorCode: extraMessageErrorCode,
+    });
+    context?.notifier({
+      eventType: 'task_failed',
+      ...updateResult,
+    });
+    getTxReceiptFailed = true;
+    // We shouldn't return here, because we need to trigger check status job in backend.
+    // This is not a ui requirement but the backend one.
+  }
+
   try {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     status = await httpService().checkStatus({
@@ -54,59 +119,32 @@ async function checkTransactionStatus({
     return;
   }
 
-  // If user cancel swap during check status api call, we should ignore check status response
+  // If user cancel swap during check status api call,
+  // or getting transaction receipt failed,
+  // we should ignore check status response and return
+  if (getTxReceiptFailed) return failed();
   if (currentStep?.status === 'failed') return;
 
   const outputAmount: string | null =
-    status?.outputAmount ||
-    (!!currentStep.outputAmount ? currentStep.outputAmount : null);
+    status?.outputAmount || (currentStep.outputAmount ? currentStep.outputAmount : null);
   const prevOutputAmount = currentStep.outputAmount || null;
   swap.extraMessage = status?.extraMessage || swap.extraMessage;
   swap.extraMessageSeverity = MessageSeverity.info;
   swap.extraMessageDetail = '';
 
   currentStep.status = status?.status || currentStep.status;
-  currentStep.diagnosisUrl =
-    status?.diagnosisUrl || currentStep.diagnosisUrl || null;
+  currentStep.diagnosisUrl = status?.diagnosisUrl || currentStep.diagnosisUrl || null;
   currentStep.outputAmount = outputAmount || currentStep.outputAmount;
   currentStep.explorerUrl = status?.explorerUrl || currentStep.explorerUrl;
   currentStep.internalSteps = status?.steps || null;
 
   const newTransaction = status?.newTx;
 
-  if (!!newTransaction) {
+  if (newTransaction) {
     currentStep.status = 'created';
     currentStep.executedTransactionId = null;
     currentStep.executedTransactionTime = null;
-    currentStep.transferTransaction = null;
-    currentStep.cosmosTransaction = null;
-    currentStep.evmTransaction = null;
-    currentStep.solanaTransaction = null;
-    currentStep.evmApprovalTransaction = null;
-    currentStep.starknetApprovalTransaction = null;
-    currentStep.starknetTransaction = null;
-    currentStep.tronApprovalTransaction = null;
-    currentStep.tronTransaction = null;
-
-    if (isEvmTransaction(newTransaction)) {
-      if (newTransaction.isApprovalTx)
-        currentStep.evmApprovalTransaction = newTransaction;
-      else currentStep.evmTransaction = newTransaction;
-    } else if (isCosmosTransaction(newTransaction)) {
-      currentStep.cosmosTransaction = newTransaction;
-    } else if (isSolanaTransaction(newTransaction)) {
-      currentStep.solanaTransaction = newTransaction;
-    } else if (isTrasnferTransaction(newTransaction)) {
-      currentStep.transferTransaction = newTransaction;
-    } else if (isStarknetTransaction(newTransaction)) {
-      if (newTransaction.isApprovalTx)
-        currentStep.starknetApprovalTransaction = newTransaction;
-      else currentStep.starknetTransaction = newTransaction;
-    } else if (isTronTransaction(newTransaction)) {
-      if (newTransaction.isApprovalTx)
-        currentStep.tronApprovalTransaction = newTransaction;
-      else currentStep.tronTransaction = newTransaction;
-    }
+    setCurrentStepTx(currentStep, newTransaction);
   }
 
   if (prevOutputAmount === null && outputAmount !== null)
@@ -127,7 +165,7 @@ async function checkTransactionStatus({
   if (currentStep.status === 'success') {
     const nextStep = getNextStep(swap, currentStep);
     swap.extraMessageDetail = '';
-    swap.extraMessage = !!nextStep
+    swap.extraMessage = nextStep
       ? `starting next step: ${nextStep.swapperId}: ${nextStep.fromBlockchain} -> ${nextStep.toBlockchain}`
       : '';
   } else if (currentStep.status === 'failed') {
@@ -143,10 +181,7 @@ async function checkTransactionStatus({
 
   if (status?.status === 'failed') {
     failed();
-  } else if (
-    status?.status === 'success' ||
-    (status?.status === 'running' && !!status.newTx)
-  ) {
+  } else if (status?.status === 'success' || (status?.status === 'running' && !!status.newTx)) {
     schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
     next();
   } else {
@@ -167,32 +202,92 @@ async function checkApprovalStatus({
   retry,
   failed,
   context,
-}: ExecuterActions<
-  SwapStorage,
-  SwapActionTypes,
-  SwapQueueContext
->): Promise<void> {
+}: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>): Promise<void> {
   const swap = getStorage().swapDetails as SwapStorage['swapDetails'];
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const currentStep = getCurrentStep(swap)!;
+  const { meta } = context;
+  const { getTransactionResponseByHash, setTransactionResponseByHash } = useTransactionsResponse();
+
+  const currentStep = getCurrentStep(swap);
+  if (!currentStep) {
+    console.log('ignore check status, current step is null');
+    return;
+  }
+
+  let txId = currentStep.executedTransactionId;
+
+  let signer: GenericSigner<Transaction> | null = null;
+  try {
+    const txType = getCurrentStepTxType(currentStep);
+    const sourceWallet = getRelatedWallet(swap, currentStep);
+    if (txType && sourceWallet)
+      signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
+  } catch (error) {
+    // wallet is not connected yet
+    // no need to do anything
+  }
+
+  try {
+    // if wallet is connected, try to get transaction reciept
+    if (signer?.wait) {
+      const txResponse = getTransactionResponseByHash(txId!);
+      const { hash: updatedTxHash, response: updatedTxResponse } = await signer.wait(
+        txId!,
+        txResponse,
+      );
+      if (updatedTxHash !== txId) {
+        currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+        const currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
+        const explorerUrl = getScannerUrl(
+          currentStep.executedTransactionId!,
+          currentStepBlockchain,
+          meta.blockchains,
+        );
+        if (explorerUrl) {
+          if (currentStep.explorerUrl && currentStep.explorerUrl?.length >= 1) {
+            currentStep.explorerUrl[currentStep.explorerUrl.length - 1] = {
+              url: explorerUrl,
+              description: 'Replaced Approve',
+            };
+          }
+        }
+        txId = currentStep.executedTransactionId;
+        if (updatedTxHash && updatedTxResponse)
+          setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+      }
+    }
+  } catch (error) {
+    const { extraMessage, extraMessageDetail, extraMessageErrorCode } = prettifyErrorMessage(error);
+    const updateResult = updateSwapStatus({
+      getStorage,
+      setStorage,
+      nextStatus: 'failed',
+      nextStepStatus: 'failed',
+      message: extraMessage,
+      details: extraMessageDetail,
+      errorCode: extraMessageErrorCode,
+    });
+    context?.notifier({
+      eventType: 'task_failed',
+      ...updateResult,
+    });
+    return failed();
+  }
+
   let isApproved = false;
   try {
     const response = await httpService().checkApproval(
       swap.requestId,
-      currentStep.executedTransactionId || ''
+      currentStep.executedTransactionId || '',
     );
     // If user cancel swap during check status api call, we should ignore check approval response
     if (currentStep?.status === 'failed') return;
 
     isApproved = response.isApproved;
-    if (
-      !isApproved &&
-      (response.txStatus === 'failed' || response.txStatus === 'success')
-    ) {
+    if (!isApproved && (response.txStatus === 'failed' || response.txStatus === 'success')) {
       let message, details;
       if (response.txStatus === 'failed') {
         message = 'Approve transaction failed';
-        details = 'Smart contract approval failed in blockchain.';
+        details = 'Smart contract approval tx failed in blockchain.';
       } else {
         message = 'Not enough approval';
         if (response.requiredApprovedAmount && response.currentApprovedAmount)
@@ -206,12 +301,12 @@ async function checkApprovalStatus({
         setStorage,
         nextStatus: 'failed',
         nextStepStatus: 'failed',
-        errorCode: 'SEND_TX_FAILED',
+        errorCode: 'INSUFFICIENT_APPROVE',
         message: message,
         details: details,
       });
       context.notifier({
-        eventType: 'smart_contract_call_failed', // TODO better event type
+        eventType: 'not_enough_approval',
         ...updateResult,
       });
       failed();
@@ -265,11 +360,14 @@ async function checkApprovalStatus({
  *
  */
 export async function checkStatus(
-  actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>
+  actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>,
 ): Promise<void> {
   const swap = actions.getStorage().swapDetails;
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const currentStep = getCurrentStep(swap)!;
+  const currentStep = getCurrentStep(swap);
+  if (!currentStep) {
+    console.log('ignore check status, current step is null', swap.requestId);
+    return;
+  }
 
   // Reset network status
   // Because when check status is on `loading` or `failed` status, it shows previous message that isn't related to current state.

package/src/actions/createTransaction.ts

@@ -2,14 +2,10 @@ import { ExecuterActions } from '@rango-dev/queue-manager-core';
 import { SwapActionTypes, SwapQueueContext, SwapStorage } from '../types';
 import {
   getCurrentStep,
-  isCosmosTransaction,
-  isEvmTransaction,
-  isSolanaTransaction,
-  isTrasnferTransaction,
-  isStarknetTransaction,
-  isTronTransaction,
   updateSwapStatus,
   throwOnOK,
+  getCurrentStepTx,
+  setCurrentStepTx,
 } from '../helpers';
 import { prettifyErrorMessage } from '../shared-errors';
 import { CreateTransactionRequest } from 'rango-sdk';
@@ -29,30 +25,9 @@ export async function createTransaction(
   const swap = getStorage().swapDetails;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
+  const transaction = getCurrentStepTx(currentStep);
 
-  const {
-    evmTransaction,
-    cosmosTransaction,
-    transferTransaction,
-    evmApprovalTransaction,
-    solanaTransaction,
-    tronTransaction,
-    tronApprovalTransaction,
-    starknetTransaction,
-    starknetApprovalTransaction,
-  } = currentStep;
-
-  if (
-    !evmTransaction &&
-    !evmApprovalTransaction &&
-    !tronTransaction &&
-    !tronApprovalTransaction &&
-    !starknetTransaction &&
-    !starknetApprovalTransaction &&
-    !cosmosTransaction &&
-    !transferTransaction &&
-    !solanaTransaction
-  ) {
+  if (!transaction) {
     const request: CreateTransactionRequest = {
       requestId: swap.requestId,
       step: currentStep.id,
@@ -72,27 +47,7 @@ export async function createTransaction(
         httpService().createTransaction(request)
       );
 
-      if (transaction) {
-        if (isEvmTransaction(transaction)) {
-          if (transaction.isApprovalTx)
-            currentStep.evmApprovalTransaction = transaction;
-          else currentStep.evmTransaction = transaction;
-        } else if (isCosmosTransaction(transaction)) {
-          currentStep.cosmosTransaction = transaction;
-        } else if (isSolanaTransaction(transaction)) {
-          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;
-        }
-      }
+      if (transaction) setCurrentStepTx(currentStep, transaction);
 
       setStorage({ ...getStorage(), swapDetails: swap });
       schedule(SwapActionTypes.EXECUTE_TRANSACTION);