@defuse-protocol/intents-sdk 0.52.0 → 0.53.0

package/dist/src/bridges/hot-bridge/hot-bridge.cjs

@@ -183,30 +183,81 @@ var HotBridge = class HotBridge {
 			status: "failed",
 			reason: "Withdrawal was cancelled"
 		};
-		if (status === require_hot_bridge_constants.HotWithdrawStatus.Completed) return {
-			status: "completed",
-			txHash: null
-		};
-		if (typeof status === "string") {
-			if (!require_hex.default(status)) {
-				args.logger?.warn("HOT Bridge incorrect destination tx hash detected", { value: status });
+		if (args.landingChain.startsWith("eip155:")) try {
+			args.logger?.info(`Using bridge indexer to retrieve HOT withdrawal hash with nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
+			const bridgeIndexerHash = await this.fetchWithdrawalHashBridgeIndexer(args.tx.hash, nonce.toString(), args.logger);
+			if (bridgeIndexerHash !== null) {
+				args.logger?.info(`Bridge indexer returned withdrawHash=${bridgeIndexerHash} for nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
+				return {
+					status: "completed",
+					txHash: bridgeIndexerHash
+				};
+			}
+		} catch (error) {
+			args.logger?.error("Bridge indexer failed unexpectedly, trying HOT API fallback", {
+				nearTxHash: args.tx.hash,
+				nonce: nonce.toString(),
+				error
+			});
+			const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
+			if (apiHash != null) {
+				args.logger?.info(`Hot Api returned withdrawHash=${apiHash} for nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
 				return {
 					status: "completed",
-					txHash: null
+					txHash: require_hot_bridge_utils.formatTxHash(apiHash, args.landingChain)
 				};
 			}
-			return {
+		}
+		else {
+			if (status === require_hot_bridge_constants.HotWithdrawStatus.Completed) return {
 				status: "completed",
-				txHash: require_hot_bridge_utils.formatTxHash(status, args.landingChain)
+				txHash: null
+			};
+			if (typeof status === "string") {
+				if (!require_hex.default(status)) {
+					args.logger?.warn("HOT Bridge incorrect destination tx hash detected", { value: status });
+					return {
+						status: "completed",
+						txHash: null
+					};
+				}
+				return {
+					status: "completed",
+					txHash: require_hot_bridge_utils.formatTxHash(status, args.landingChain)
+				};
+			}
+			const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
+			if (apiHash != null) return {
+				status: "completed",
+				txHash: require_hot_bridge_utils.formatTxHash(apiHash, args.landingChain)
 			};
 		}
-		const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
-		if (apiHash != null) return {
-			status: "completed",
-			txHash: require_hot_bridge_utils.formatTxHash(apiHash, args.landingChain)
-		};
 		return { status: "pending" };
 	}
+	async fetchWithdrawalHashBridgeIndexer(nearTxHash, nonce, logger) {
+		const { withdrawals } = await _defuse_protocol_internal_utils.bridgeIndexer.httpClient.withdrawalsByNearTxHash(nearTxHash, {
+			timeout: typeof window !== "undefined" ? 1e4 : 3e3,
+			logger
+		});
+		const withdrawal = withdrawals.find((withdrawal$1) => {
+			return withdrawal$1.nonce === nonce;
+		});
+		if (withdrawal === void 0) {
+			logger?.info("HOT Bridge indexer withdrawal hash not found", {
+				nearTxHash,
+				nonce: nonce.toString()
+			});
+			return null;
+		}
+		if (withdrawal.hash === null || withdrawal.hash === "") {
+			logger?.info(`HOT Bridge returned invalid hash, expected a non empty string, got ${withdrawal.hash}`, {
+				nearTxHash,
+				nonce: nonce.toString()
+			});
+			return null;
+		}
+		return withdrawal.hash;
+	}
 	async fetchWithdrawalHashFromApi(nearTxHash, nonce, logger) {
 		try {
 			const data = await (await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.hotSdk.api.requestApi(`/api/v1/evm/bridge_withdrawal_hash?near_trx=${nearTxHash}`, { method: "GET" }), { timeout: HotBridge.API_FALLBACK_TIMEOUT_MS })).json();

package/dist/src/bridges/hot-bridge/hot-bridge.js

@@ -9,7 +9,7 @@ import { HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalNotFoundError } fr
 import { HotWithdrawStatus, MIN_GAS_AMOUNT } from "./hot-bridge-constants.js";
 import { formatTxHash, getFeeAssetIdForChain, hotBlockchainInvariant, hotNetworkIdToCAIP2, toHotNetworkId } from "./hot-bridge-utils.js";
 import isHex from "../../lib/hex.js";
-import { assert, withTimeout } from "@defuse-protocol/internal-utils";
+import { assert, bridgeIndexer, withTimeout } from "@defuse-protocol/internal-utils";
 import { OMNI_HOT_V2, utils as utils$1 } from "@hot-labs/omni-sdk";
 import { LRUCache } from "lru-cache";
 import * as v from "valibot";
@@ -181,30 +181,81 @@ var HotBridge$1 = class HotBridge$1 {
 			status: "failed",
 			reason: "Withdrawal was cancelled"
 		};
-		if (status === HotWithdrawStatus.Completed) return {
-			status: "completed",
-			txHash: null
-		};
-		if (typeof status === "string") {
-			if (!isHex(status)) {
-				args.logger?.warn("HOT Bridge incorrect destination tx hash detected", { value: status });
+		if (args.landingChain.startsWith("eip155:")) try {
+			args.logger?.info(`Using bridge indexer to retrieve HOT withdrawal hash with nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
+			const bridgeIndexerHash = await this.fetchWithdrawalHashBridgeIndexer(args.tx.hash, nonce.toString(), args.logger);
+			if (bridgeIndexerHash !== null) {
+				args.logger?.info(`Bridge indexer returned withdrawHash=${bridgeIndexerHash} for nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
+				return {
+					status: "completed",
+					txHash: bridgeIndexerHash
+				};
+			}
+		} catch (error) {
+			args.logger?.error("Bridge indexer failed unexpectedly, trying HOT API fallback", {
+				nearTxHash: args.tx.hash,
+				nonce: nonce.toString(),
+				error
+			});
+			const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
+			if (apiHash != null) {
+				args.logger?.info(`Hot Api returned withdrawHash=${apiHash} for nearTxHash=${args.tx.hash} nonce=${nonce.toString()}`);
 				return {
 					status: "completed",
-					txHash: null
+					txHash: formatTxHash(apiHash, args.landingChain)
 				};
 			}
-			return {
+		}
+		else {
+			if (status === HotWithdrawStatus.Completed) return {
 				status: "completed",
-				txHash: formatTxHash(status, args.landingChain)
+				txHash: null
+			};
+			if (typeof status === "string") {
+				if (!isHex(status)) {
+					args.logger?.warn("HOT Bridge incorrect destination tx hash detected", { value: status });
+					return {
+						status: "completed",
+						txHash: null
+					};
+				}
+				return {
+					status: "completed",
+					txHash: formatTxHash(status, args.landingChain)
+				};
+			}
+			const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
+			if (apiHash != null) return {
+				status: "completed",
+				txHash: formatTxHash(apiHash, args.landingChain)
 			};
 		}
-		const apiHash = await this.fetchWithdrawalHashFromApi(args.tx.hash, nonce, args.logger);
-		if (apiHash != null) return {
-			status: "completed",
-			txHash: formatTxHash(apiHash, args.landingChain)
-		};
 		return { status: "pending" };
 	}
+	async fetchWithdrawalHashBridgeIndexer(nearTxHash, nonce, logger) {
+		const { withdrawals } = await bridgeIndexer.httpClient.withdrawalsByNearTxHash(nearTxHash, {
+			timeout: typeof window !== "undefined" ? 1e4 : 3e3,
+			logger
+		});
+		const withdrawal = withdrawals.find((withdrawal$1) => {
+			return withdrawal$1.nonce === nonce;
+		});
+		if (withdrawal === void 0) {
+			logger?.info("HOT Bridge indexer withdrawal hash not found", {
+				nearTxHash,
+				nonce: nonce.toString()
+			});
+			return null;
+		}
+		if (withdrawal.hash === null || withdrawal.hash === "") {
+			logger?.info(`HOT Bridge returned invalid hash, expected a non empty string, got ${withdrawal.hash}`, {
+				nearTxHash,
+				nonce: nonce.toString()
+			});
+			return null;
+		}
+		return withdrawal.hash;
+	}
 	async fetchWithdrawalHashFromApi(nearTxHash, nonce, logger) {
 		try {
 			const data = await (await withTimeout(() => this.hotSdk.api.requestApi(`/api/v1/evm/bridge_withdrawal_hash?near_trx=${nearTxHash}`, { method: "GET" }), { timeout: HotBridge$1.API_FALLBACK_TIMEOUT_MS })).json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defuse-protocol/intents-sdk",
-  "version": "0.52.0",
+  "version": "0.53.0",
   "private": false,
   "type": "module",
   "repository": {
@@ -46,7 +46,7 @@
     "valibot": "^1.0.0",
     "viem": "^2.0.0",
     "@defuse-protocol/contract-types": "0.6.0",
-    "@defuse-protocol/internal-utils": "0.27.0"
+    "@defuse-protocol/internal-utils": "0.28.0"
   },
   "devDependencies": {
     "tsdown": "0.19.0"