Merge branch 'main' into permits

Author: chybisov

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.5.2](https://github.com/lifinance/sdk/compare/v3.5.1...v3.5.2) (2025-01-14)
+
+
+### Bug Fixes
+
+* preserve transaction hash when creating new process ([#232](https://github.com/lifinance/sdk/issues/232)) ([7e8c829](https://github.com/lifinance/sdk/commit/7e8c829af53ba9e9333333df54b3a67e44702c4c))
+
 ### [3.5.1](https://github.com/lifinance/sdk/compare/v3.5.0...v3.5.1) (2025-01-09)
 
 

examples/node/package.json

@@ -12,7 +12,7 @@
     "@wagmi/connectors": "^5.7.3",
     "@wagmi/core": "^2.16.3",
     "dotenv": "^16.4.7",
-    "viem": "^2.22.5"
+    "viem": "^2.22.8"
   },
   "scripts": {
     "example:swap": "tsx examples/swap.ts",
@@ -24,7 +24,7 @@
     "example:yearn": "tsx examples/yearnDeposit.ts"
   },
   "devDependencies": {
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.10.6",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   }

examples/node/pnpm-lock.yaml

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/sdk",
-  "version": "3.6.0-beta.0",
+  "version": "3.5.2",
   "description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
   "keywords": [
     "bridge",
@@ -100,7 +100,7 @@
     "bech32": "^2.0.0",
     "bitcoinjs-lib": "^7.0.0-rc.0",
     "bs58": "^6.0.0",
-    "viem": "^2.22.5"
+    "viem": "^2.22.8"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",

package.json

@@ -508,6 +508,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,
@@ -519,9 +523,10 @@ export class EVMStepExecutor extends BaseStepExecutor {
 
     await waitForDestinationChainTransaction(
       step,
-      process,
-      this.statusManager,
-      toChain
+      process.type,
+      transactionHash,
+      toChain,
+      this.statusManager
     )
 
     // DONE

pnpm-lock.yaml

@@ -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

src/core/EVM/EVMStepExecutor.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
     )
 

src/core/Solana/SolanaStepExecutor.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: