@defuse-protocol/intents-sdk 0.46.0 → 0.47.0

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

@@ -12,14 +12,46 @@ const require_hot_bridge_utils = require('./hot-bridge-utils.cjs');
 const require_hex = require('../../lib/hex.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let _hot_labs_omni_sdk = require("@hot-labs/omni-sdk");
+let lru_cache = require("lru-cache");
+let valibot = require("valibot");
+valibot = require_rolldown_runtime.__toESM(valibot);
 
 //#region src/bridges/hot-bridge/hot-bridge.ts
-var HotBridge = class {
+const HotApiWithdrawalSchema = valibot.object({
+	hash: valibot.nullable(valibot.string()),
+	nonce: valibot.string(),
+	near_trx: valibot.string(),
+	verified_withdraw: valibot.boolean(),
+	chain_id: valibot.number()
+});
+const HotApiWithdrawalResponseSchema = valibot.object({
+	hash: valibot.nullable(valibot.string()),
+	nonce: valibot.string(),
+	near_trx: valibot.string(),
+	withdrawals: valibot.array(HotApiWithdrawalSchema)
+});
+var HotBridge = class HotBridge {
+	static {
+		this.API_FALLBACK_TIMEOUT_MS = 5e3;
+	}
+	static {
+		this.NEAR_RPC_TIMEOUT_MS = 1e4;
+	}
 	constructor({ envConfig, hotSdk, solverRelayApiKey }) {
 		this.route = require_route_enum.RouteEnum.HotBridge;
 		this.envConfig = envConfig;
 		this.hotSdk = hotSdk;
 		this.solverRelayApiKey = solverRelayApiKey;
+		this.noncesCache = new lru_cache.LRUCache({
+			max: 50,
+			ttl: 3600 * 1e3,
+			fetchMethod: async (_key, _staleValue, { context: tx }) => {
+				return (0, _defuse_protocol_internal_utils.withTimeout)(() => this.hotSdk.near.parseWithdrawalNonces(tx.hash, tx.accountId), { timeout: HotBridge.NEAR_RPC_TIMEOUT_MS });
+			}
+		});
+	}
+	getNoncesCacheKey(tx) {
+		return `${tx.hash}:${tx.accountId}`;
 	}
 	is(routeConfig) {
 		return routeConfig.route === require_route_enum.RouteEnum.HotBridge;
@@ -141,7 +173,10 @@ var HotBridge = class {
 		};
 	}
 	async describeWithdrawal(args) {
-		const nonce = (await this.hotSdk.near.parseWithdrawalNonces(args.tx.hash, args.tx.accountId))[args.index];
+		const cacheKey = this.getNoncesCacheKey(args.tx);
+		const nonces = await this.noncesCache.fetch(cacheKey, { context: args.tx });
+		if (nonces == null) throw new require_error.HotWithdrawalNotFoundError(args.tx.hash, args.index);
+		const nonce = nonces[args.index];
 		if (nonce == null) throw new require_error.HotWithdrawalNotFoundError(args.tx.hash, args.index);
 		const status = await this.hotSdk.getGaslessWithdrawStatus(nonce.toString());
 		if (status === require_hot_bridge_constants.HotWithdrawStatus.Canceled) return {
@@ -165,8 +200,41 @@ var HotBridge = class {
 				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)
+		};
 		return { status: "pending" };
 	}
+	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();
+			const parseResult = valibot.safeParse(HotApiWithdrawalResponseSchema, data);
+			if (!parseResult.success) {
+				logger?.debug("HOT API response parse failed", { issues: parseResult.issues });
+				return null;
+			}
+			const withdrawal = parseResult.output.withdrawals.find((w) => w.nonce === nonce.toString());
+			if (withdrawal?.hash) {
+				const hash = withdrawal.hash.replace(/^0x/, "");
+				if (require_hex.default(hash)) {
+					logger?.info("HOT withdrawal hash found via API fallback", {
+						nearTxHash,
+						nonce: nonce.toString()
+					});
+					return hash;
+				}
+			}
+			return null;
+		} catch (error) {
+			logger?.debug("HOT API fallback failed", {
+				error,
+				nearTxHash
+			});
+			return null;
+		}
+	}
 };
 
 //#endregion

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

@@ -11,14 +11,45 @@ import { formatTxHash, getFeeAssetIdForChain, hotBlockchainInvariant, hotNetwork
 import isHex from "../../lib/hex.js";
 import { assert, 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";
 
 //#region src/bridges/hot-bridge/hot-bridge.ts
-var HotBridge$1 = class {
+const HotApiWithdrawalSchema = v.object({
+	hash: v.nullable(v.string()),
+	nonce: v.string(),
+	near_trx: v.string(),
+	verified_withdraw: v.boolean(),
+	chain_id: v.number()
+});
+const HotApiWithdrawalResponseSchema = v.object({
+	hash: v.nullable(v.string()),
+	nonce: v.string(),
+	near_trx: v.string(),
+	withdrawals: v.array(HotApiWithdrawalSchema)
+});
+var HotBridge$1 = class HotBridge$1 {
+	static {
+		this.API_FALLBACK_TIMEOUT_MS = 5e3;
+	}
+	static {
+		this.NEAR_RPC_TIMEOUT_MS = 1e4;
+	}
 	constructor({ envConfig, hotSdk, solverRelayApiKey }) {
 		this.route = RouteEnum.HotBridge;
 		this.envConfig = envConfig;
 		this.hotSdk = hotSdk;
 		this.solverRelayApiKey = solverRelayApiKey;
+		this.noncesCache = new LRUCache({
+			max: 50,
+			ttl: 3600 * 1e3,
+			fetchMethod: async (_key, _staleValue, { context: tx }) => {
+				return withTimeout(() => this.hotSdk.near.parseWithdrawalNonces(tx.hash, tx.accountId), { timeout: HotBridge$1.NEAR_RPC_TIMEOUT_MS });
+			}
+		});
+	}
+	getNoncesCacheKey(tx) {
+		return `${tx.hash}:${tx.accountId}`;
 	}
 	is(routeConfig) {
 		return routeConfig.route === RouteEnum.HotBridge;
@@ -140,7 +171,10 @@ var HotBridge$1 = class {
 		};
 	}
 	async describeWithdrawal(args) {
-		const nonce = (await this.hotSdk.near.parseWithdrawalNonces(args.tx.hash, args.tx.accountId))[args.index];
+		const cacheKey = this.getNoncesCacheKey(args.tx);
+		const nonces = await this.noncesCache.fetch(cacheKey, { context: args.tx });
+		if (nonces == null) throw new HotWithdrawalNotFoundError(args.tx.hash, args.index);
+		const nonce = nonces[args.index];
 		if (nonce == null) throw new HotWithdrawalNotFoundError(args.tx.hash, args.index);
 		const status = await this.hotSdk.getGaslessWithdrawStatus(nonce.toString());
 		if (status === HotWithdrawStatus.Canceled) return {
@@ -164,8 +198,41 @@ var HotBridge$1 = class {
 				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)
+		};
 		return { status: "pending" };
 	}
+	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();
+			const parseResult = v.safeParse(HotApiWithdrawalResponseSchema, data);
+			if (!parseResult.success) {
+				logger?.debug("HOT API response parse failed", { issues: parseResult.issues });
+				return null;
+			}
+			const withdrawal = parseResult.output.withdrawals.find((w) => w.nonce === nonce.toString());
+			if (withdrawal?.hash) {
+				const hash = withdrawal.hash.replace(/^0x/, "");
+				if (isHex(hash)) {
+					logger?.info("HOT withdrawal hash found via API fallback", {
+						nearTxHash,
+						nonce: nonce.toString()
+					});
+					return hash;
+				}
+			}
+			return null;
+		} catch (error) {
+			logger?.debug("HOT API fallback failed", {
+				error,
+				nearTxHash
+			});
+			return null;
+		}
+	}
 };
 
 //#endregion

package/dist/src/bridges/omni-bridge/omni-bridge-utils.cjs

@@ -3,9 +3,9 @@ const require_caip2 = require('../../lib/caip2.cjs');
 const require_omni_bridge_constants = require('./omni-bridge-constants.cjs');
 const require_poa_tokens_routable_through_omni_bridge = require('../../constants/poa-tokens-routable-through-omni-bridge.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
-let omni_bridge_sdk = require("omni-bridge-sdk");
 let valibot = require("valibot");
 valibot = require_rolldown_runtime.__toESM(valibot);
+let omni_bridge_sdk = require("omni-bridge-sdk");
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
 function createWithdrawIntentsPrimitive(params) {

package/dist/src/bridges/omni-bridge/omni-bridge-utils.js

@@ -2,8 +2,8 @@ import { Chains } from "../../lib/caip2.js";
 import { MIN_GAS_AMOUNT, OMNI_BRIDGE_CONTRACT } from "./omni-bridge-constants.js";
 import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from "../../constants/poa-tokens-routable-through-omni-bridge.js";
 import { assert, utils } from "@defuse-protocol/internal-utils";
-import { ChainKind, calculateStorageAccountId, getChain, isBridgeToken, omniAddress } from "omni-bridge-sdk";
 import * as v from "valibot";
+import { ChainKind, calculateStorageAccountId, getChain, isBridgeToken, omniAddress } from "omni-bridge-sdk";
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
 function createWithdrawIntentsPrimitive(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defuse-protocol/intents-sdk",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "private": false,
   "type": "module",
   "repository": {
@@ -31,7 +31,7 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@hot-labs/omni-sdk": "2.24.3",
+    "@hot-labs/omni-sdk": "2.24.7",
     "@isaacs/ttlcache": "^1.0.0",
     "@lifeomic/attempt": "^3.0.0",
     "@near-js/accounts": "^2.0.1",
@@ -47,8 +47,8 @@
     "ripple-address-codec": "^5.0.0",
     "valibot": "^1.0.0",
     "viem": "^2.0.0",
-    "@defuse-protocol/contract-types": "0.4.4",
-    "@defuse-protocol/internal-utils": "0.24.0"
+    "@defuse-protocol/contract-types": "0.5.0",
+    "@defuse-protocol/internal-utils": "0.24.2"
   },
   "devDependencies": {
     "tsdown": "0.19.0"