fix: preserve transaction hash when creating new process (#232)

lifinance · Jan 14, 2025 · 7e8c829 · 7e8c829
1 parent ec7ab5c
commit 7e8c829
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/src/core/EVM/EVMStepExecutor.ts b/src/core/EVM/EVMStepExecutor.ts
@@ -415,6 +415,10 @@ export class EVMStepExecutor extends BaseStepExecutor {
     }
 
     // Wait for the transaction status on the destination chain
+    const transactionHash = process.txHash
+    if (!transactionHash) {
+      throw new Error('Transaction hash is undefined.')
+    }
     if (isBridgeExecution) {
       process = this.statusManager.findOrCreateProcess({
         step,
@@ -426,9 +430,10 @@ export class EVMStepExecutor extends BaseStepExecutor {
 
     await waitForDestinationChainTransaction(
       step,
-      process,
-      this.statusManager,
-      toChain
+      process.type,
+      transactionHash,
+      toChain,
+      this.statusManager
     )
 
     // DONE

diff --git a/src/core/Solana/SolanaStepExecutor.ts b/src/core/Solana/SolanaStepExecutor.ts
@@ -218,6 +218,10 @@ export class SolanaStepExecutor extends BaseStepExecutor {
     }
 
     // Wait for the transaction status on the destination chain
+    const transactionHash = process.txHash
+    if (!transactionHash) {
+      throw new Error('Transaction hash is undefined.')
+    }
     if (isBridgeExecution) {
       process = this.statusManager.findOrCreateProcess({
         step,
@@ -229,9 +233,10 @@ export class SolanaStepExecutor extends BaseStepExecutor {
 
     await waitForDestinationChainTransaction(
       step,
-      process,
-      this.statusManager,
-      toChain
+      process.type,
+      transactionHash,
+      toChain,
+      this.statusManager
     )
 
     // DONE

diff --git a/src/core/UTXO/UTXOStepExecutor.ts b/src/core/UTXO/UTXOStepExecutor.ts
@@ -264,6 +264,10 @@ export class UTXOStepExecutor extends BaseStepExecutor {
     }
 
     // Wait for the transaction status on the destination chain
+    const transactionHash = process.txHash
+    if (!transactionHash) {
+      throw new Error('Transaction hash is undefined.')
+    }
     if (isBridgeExecution) {
       process = this.statusManager.findOrCreateProcess({
         step,
@@ -275,9 +279,10 @@ export class UTXOStepExecutor extends BaseStepExecutor {
 
     await waitForDestinationChainTransaction(
       step,
-      process,
-      this.statusManager,
+      process.type,
+      transactionHash,
       toChain,
+      this.statusManager,
       10_000
     )
 

diff --git a/src/core/waitForDestinationChainTransaction.ts b/src/core/waitForDestinationChainTransaction.ts
@@ -2,7 +2,7 @@ import type {
   ExtendedChain,
   ExtendedTransactionInfo,
   FullStatusData,
-  Process,
+  ProcessType,
 } from '@lifi/types'
 import { LiFiErrorCode } from '../errors/constants.js'
 import { getTransactionFailedMessage } from '../utils/getTransactionMessage.js'
@@ -12,28 +12,25 @@ import { waitForTransactionStatus } from './waitForTransactionStatus.js'
 
 export async function waitForDestinationChainTransaction(
   step: LiFiStepExtended,
-  process: Process,
-  statusManager: StatusManager,
+  processType: ProcessType,
+  transactionHash: string,
   toChain: ExtendedChain,
+  statusManager: StatusManager,
   pollingInterval?: number
 ): Promise<LiFiStepExtended> {
-  if (!process.txHash) {
-    throw new Error('Transaction hash is undefined.')
-  }
-
   try {
     const statusResponse = (await waitForTransactionStatus(
-      process.txHash,
+      transactionHash,
       statusManager,
-      process.type,
+      processType,
       step,
       pollingInterval
     )) as FullStatusData
 
     const statusReceiving = statusResponse.receiving as ExtendedTransactionInfo
 
     // Update process status
-    statusManager.updateProcess(step, process.type, 'DONE', {
+    statusManager.updateProcess(step, processType, 'DONE', {
       substatus: statusResponse.substatus,
       substatusMessage: statusResponse.substatusMessage,
       txHash: statusReceiving?.txHash,
@@ -62,9 +59,12 @@ export async function waitForDestinationChainTransaction(
 
     return step
   } catch (e: unknown) {
-    const htmlMessage = await getTransactionFailedMessage(step, process.txLink)
+    const htmlMessage = await getTransactionFailedMessage(
+      step,
+      `${toChain.metamask.blockExplorerUrls[0]}tx/${transactionHash}`
+    )
 
-    statusManager.updateProcess(step, process.type, 'FAILED', {
+    statusManager.updateProcess(step, processType, 'FAILED', {
       error: {
         code: LiFiErrorCode.TransactionFailed,
         message: