@rhea-finance/cross-chain-aggregation-dex 2.0.6 → 2.0.8

package/dist/index.js

@@ -28,6 +28,79 @@ function asSwapSdkError(error, stage) {
   return new SwapSdkError("API_ERROR", stage, message, { cause: error });
 }
 
+// src/utils/orderStatus.ts
+function resolveSwapReportRecordId(reportData) {
+  if (!reportData || typeof reportData !== "object") return "";
+  const id = reportData.id;
+  return id === void 0 || id === null ? "" : String(id).trim();
+}
+function buildOrderStatusQuery(params) {
+  const normalizedRecordId = String(params.recordId ?? "").trim();
+  if (normalizedRecordId) {
+    return { recordId: normalizedRecordId };
+  }
+  const query = {};
+  const orderId = params.orderId?.trim();
+  const txHash = params.txHash?.trim();
+  if (orderId) {
+    query.orderId = orderId;
+  } else if (txHash) {
+    query.txHash = txHash;
+  }
+  const router = params.router?.trim();
+  if (router) query.router = router;
+  const chainId = params.chainId;
+  if (chainId !== void 0 && chainId !== null && String(chainId).trim() !== "") {
+    query.chainId = chainId;
+  }
+  return query;
+}
+function resolveOrderStatusLookup(input) {
+  const recordId = String(input.recordId ?? "").trim();
+  if (recordId) {
+    return { recordId };
+  }
+  const router = input.router?.trim();
+  const orderId = input.orderId?.trim();
+  const txHash = input.txHash?.trim();
+  const statusKey = orderId || txHash;
+  if (!statusKey || !router) return void 0;
+  const chainId = input.chainId !== void 0 && input.chainId !== null && String(input.chainId).trim() !== "" ? String(input.chainId).trim() : void 0;
+  return {
+    ...orderId ? { orderId } : { txHash },
+    router,
+    ...chainId ? { chainId } : {}
+  };
+}
+function assertOrderStatusParams(params) {
+  const lookup = resolveOrderStatusLookup(params);
+  if (!lookup) {
+    throw new SwapSdkError(
+      "INVALID_REQUEST",
+      "status",
+      "Order status requires recordId, or orderId/txHash with router"
+    );
+  }
+  return lookup;
+}
+function orderStatusParamsFromHistoryItem(item) {
+  const recordId = String(item.id ?? "").trim();
+  if (recordId) {
+    return { recordId };
+  }
+  return {
+    ...item.orderId ? { orderId: item.orderId } : {},
+    ...item.sourceTxHash ? { txHash: item.sourceTxHash } : {},
+    ...item.router ? { router: item.router } : {}
+  };
+}
+function resolveSourceTxHash(input) {
+  const direct = input.txHash?.trim();
+  if (direct) return direct;
+  const last = input.txHashes?.[input.txHashes.length - 1]?.trim();
+  return last || void 0;
+}
+
 // src/api/ApiClient.ts
 var DEFAULT_RETRY = {
   maxRetries: 2,
@@ -50,7 +123,7 @@ var ApiClient = class {
     this.fetchImpl = fetchImpl.bind(globalThis);
   }
   quote(body, options = {}) {
-    return this.request("/api/swap/quote", "quote", {
+    return this.request("/api/v2/swap/quote", "quote", {
       ...options,
       method: "POST",
       body,
@@ -58,7 +131,7 @@ var ApiClient = class {
     });
   }
   build(body, options = {}) {
-    return this.request("/api/swap/swap", "build", {
+    return this.request("/api/v2/swap/swap", "build", {
       ...options,
       method: "POST",
       body
@@ -72,15 +145,26 @@ var ApiClient = class {
     });
   }
   getOrderStatus(params, options = {}) {
+    const query = buildOrderStatusQuery(params);
+    if (!query.recordId && !query.orderId && !query.txHash) {
+      throw new SwapSdkError(
+        "INVALID_REQUEST",
+        "status",
+        "Order status requires recordId, or orderId/txHash with router"
+      );
+    }
+    if (!query.recordId && !query.router) {
+      throw new SwapSdkError(
+        "INVALID_REQUEST",
+        "status",
+        "Order status requires router when recordId is absent"
+      );
+    }
     return this.request("/api/swap/order-status", "status", {
       ...options,
       method: "GET",
       retryableOperation: true,
-      query: {
-        orderId: params.orderId,
-        router: params.router,
-        chainId: params.chainId
-      }
+      query
     });
   }
   report(body, options = {}) {
@@ -1913,7 +1997,6 @@ var McaSwapService = class {
     this.client = client;
     this.relayerReports = /* @__PURE__ */ new Map();
     this.now = config.now ?? Date.now;
-    this.maxQuoteAgeMs = config.maxQuoteAgeMs === void 0 ? 3e4 : config.maxQuoteAgeMs;
     this.reportMode = config.reportMode ?? "auto";
     this.onEvent = config.onEvent;
     this.resolveSignerIdentity = config.resolveSignerIdentity;
@@ -1935,7 +2018,6 @@ var McaSwapService = class {
     return normalizeMcaQuote(request, signer, quote);
   }
   async build(input) {
-    this.assertQuoteFresh(input.quote);
     if (input.quote.executionMode === "withdraw-relayer") {
       throw new SwapSdkError(
         "INVALID_REQUEST",
@@ -1956,7 +2038,6 @@ var McaSwapService = class {
     };
   }
   async swap(input) {
-    this.assertQuoteFresh(input.quote);
     if (input.quote.executionMode === "withdraw-relayer") {
       return this.executeRelayerWithdraw({ ...input, quote: input.quote });
     }
@@ -1984,9 +2065,13 @@ var McaSwapService = class {
       onEvent: input.onEvent
     });
     if (input.quote.executionMode === "withdraw-near" && input.waitFor === "completed") {
-      const status = await this.client.waitForOrder({
+      const statusLookup = resolveOrderStatusLookup({
+        recordId: result.report?.recordId,
         orderId: nearStatusKey,
-        router: input.quote.route.router,
+        router: input.quote.route.router
+      }) ?? { orderId: nearStatusKey, router: input.quote.route.router };
+      const status = await this.client.waitForOrder({
+        ...statusLookup,
         ...input.orderPolling,
         signal: input.signal
       });
@@ -2212,10 +2297,17 @@ var McaSwapService = class {
         raw
       };
       emit({ type: "submitted", executionId, orderId });
+      let reportRecordId;
       if (this.reportMode === "auto") {
         try {
-          await this.client.reportRaw(reportRequest, { signal: input.signal });
-          result.report = { status: "reported" };
+          const reportData = await this.client.reportRaw(reportRequest, {
+            signal: input.signal
+          });
+          reportRecordId = resolveSwapReportRecordId(reportData) || void 0;
+          result.report = {
+            status: "reported",
+            ...reportRecordId ? { recordId: reportRecordId } : {}
+          };
         } catch (error) {
           const warning = {
             code: "REPORT_FAILED",
@@ -2227,9 +2319,13 @@ var McaSwapService = class {
         }
       }
       if (input.waitFor === "completed") {
-        const status = await this.client.waitForOrder({
+        const statusLookup = resolveOrderStatusLookup({
+          recordId: reportRecordId ?? result.report?.recordId,
           orderId,
-          router,
+          router
+        }) ?? { orderId, router };
+        const status = await this.client.waitForOrder({
+          ...statusLookup,
           ...input.orderPolling,
           signal: input.signal
         });
@@ -2272,18 +2368,6 @@ var McaSwapService = class {
     this.onEvent?.(event);
     if (local !== this.onEvent) local?.(event);
   }
-  assertQuoteFresh(quote) {
-    const now = this.now();
-    const expiredByApi = quote.expiresAt !== void 0 && now > quote.expiresAt;
-    const expiredByAge = this.maxQuoteAgeMs !== null && now - quote.receivedAt > Math.max(0, this.maxQuoteAgeMs);
-    if (expiredByApi || expiredByAge) {
-      throw new SwapSdkError(
-        "QUOTE_EXPIRED",
-        "build",
-        "Quote has expired; request a fresh quote"
-      );
-    }
-  }
 };
 function buildRequestFromQuote(quote) {
   const context = quote.buildContext;
@@ -2331,7 +2415,6 @@ var SwapClient = class {
     this.now = config.now ?? Date.now;
     this.managedSwapFlow = new McaSwapService(this, {
       now: this.now,
-      maxQuoteAgeMs: config.maxQuoteAgeMs,
       reportMode: this.reportMode,
       resolveSignerIdentity: (chain) => this.registry.getSigner(chain),
       resolveMessageSigner: (chain) => this.registry.getSigner(chain, true),
@@ -2416,7 +2499,6 @@ var SwapClient = class {
     return this.buildStandardSwap(input);
   }
   async buildStandardSwap(input) {
-    this.assertQuoteFresh(input.quote);
     const executionId = createExecutionId();
     this.emit({ type: "build-started", executionId });
     const context = input.quote.buildContext;
@@ -2521,10 +2603,17 @@ var SwapClient = class {
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
+      let reportRecordId;
       if (this.reportMode === "auto" && reportRequest) {
         try {
-          await this.api.report(reportRequest, { signal: input.signal });
-          result.report = { status: "reported" };
+          const reportData = await this.api.report(reportRequest, {
+            signal: input.signal
+          });
+          reportRecordId = resolveSwapReportRecordId(reportData) || void 0;
+          result.report = {
+            status: "reported",
+            ...reportRecordId ? { recordId: reportRecordId } : {}
+          };
         } catch (error) {
           const warning = {
             code: "REPORT_FAILED",
@@ -2537,25 +2626,29 @@ var SwapClient = class {
       }
       const waitsForCompletion = (input.waitFor ?? "submitted") === "completed";
       const requiresOrderStatus = build.isCrossChain || build.request?.confidentiality === "basic";
-      if (waitsForCompletion && requiresOrderStatus && !orderId) {
+      const statusLookup = resolveOrderStatusLookup({
+        recordId: reportRecordId ?? result.report?.recordId,
+        orderId,
+        txHash: resolveSourceTxHash(chainResult),
+        router: orderRouter ?? build.router,
+        chainId: orderChainId
+      });
+      if (waitsForCompletion && requiresOrderStatus && !statusLookup) {
         throw new SwapSdkError(
           "INVALID_API_RESPONSE",
           "status",
-          "Swap submitted, but the API did not provide a status key",
+          "Swap submitted, but no report record id, status key, or source transaction hash is available",
           {
             details: {
               executionId: build.executionId,
-              ...result.txHash ? { txHash: result.txHash } : {},
               router: orderRouter ?? build.router
             }
           }
         );
       }
-      if (waitsForCompletion && orderId) {
+      if (waitsForCompletion && statusLookup) {
         const status = await this.waitForOrder({
-          orderId,
-          router: orderRouter ?? build.router,
-          chainId: orderChainId,
+          ...statusLookup,
           ...input.orderPolling,
           signal: input.signal
         });
@@ -2593,21 +2686,22 @@ var SwapClient = class {
     });
   }
   async getOrderStatus(input) {
-    const raw = await this.api.getOrderStatus(
-      {
-        orderId: input.orderId,
-        router: input.router,
-        chainId: input.chainId
-      },
-      { signal: input.signal }
-    );
+    const { signal, ...reference } = input;
+    const lookup = assertOrderStatusParams(reference);
+    const raw = await this.api.getOrderStatus(lookup, { signal });
     return {
-      orderId: input.orderId,
-      router: input.router,
+      ...lookup,
+      ...lookup.router || input.router ? { router: lookup.router ?? input.router } : {},
       status: normalizeOrderStatus(raw),
       raw
     };
   }
+  async getHistoryOrderStatus(item, options = {}) {
+    return this.getOrderStatus({
+      ...orderStatusParamsFromHistoryItem(item),
+      signal: options.signal
+    });
+  }
   async waitForOrder(input) {
     const intervalMs = input.intervalMs ?? 5e3;
     const timeoutMs = input.timeoutMs;
@@ -2644,7 +2738,7 @@ var SwapClient = class {
   reportRaw(request, options = {}) {
     return this.api.report(request, options);
   }
-  report(result) {
+  async report(result) {
     const managedReport = this.managedSwapFlow.reportIfManaged(result);
     if (managedReport) return managedReport;
     const request = this.reportRequests.get(result.executionId);
@@ -2655,7 +2749,13 @@ var SwapClient = class {
         `No report context for execution ${result.executionId}`
       );
     }
-    return this.api.report(request);
+    const raw = await this.api.report(request);
+    const recordId = resolveSwapReportRecordId(raw) || void 0;
+    result.report = {
+      status: "reported",
+      ...recordId ? { recordId } : {}
+    };
+    return raw;
   }
   retryReport(result) {
     return this.report(result);
@@ -2704,19 +2804,6 @@ var SwapClient = class {
   emit(event) {
     this.config.onEvent?.(event);
   }
-  assertQuoteFresh(quote) {
-    const now = this.now();
-    const maxAge = this.config.maxQuoteAgeMs === void 0 ? 3e4 : this.config.maxQuoteAgeMs;
-    const expiredByApi = quote.expiresAt !== void 0 && now > quote.expiresAt;
-    const expiredByAge = maxAge !== null && now - quote.receivedAt > Math.max(0, maxAge);
-    if (expiredByApi || expiredByAge) {
-      throw new SwapSdkError(
-        "QUOTE_EXPIRED",
-        "build",
-        "Quote has expired; request a fresh quote"
-      );
-    }
-  }
   createReportRequest(build, result) {
     const request = build.request;
     const reportContext = build.reportContext;
@@ -2830,8 +2917,10 @@ exports.SwapClient = SwapClient;
 exports.SwapSdkError = SwapSdkError;
 exports.asSwapSdkError = asSwapSdkError;
 exports.assertBaseUnitAmount = assertBaseUnitAmount;
+exports.assertOrderStatusParams = assertOrderStatusParams;
 exports.buildMcaWithdrawRelayerRequest = buildMcaWithdrawRelayerRequest;
 exports.buildNearMcaWithdrawTransactions = buildNearMcaWithdrawTransactions;
+exports.buildOrderStatusQuery = buildOrderStatusQuery;
 exports.createExecutionId = createExecutionId;
 exports.extractMcaWithdrawBusiness = extractMcaWithdrawBusiness;
 exports.extractMcaWithdrawDepositAddress = extractMcaWithdrawDepositAddress;
@@ -2848,10 +2937,14 @@ exports.normalizeHistoryStatus = normalizeHistoryStatus;
 exports.normalizeMcaQuote = normalizeMcaQuote;
 exports.normalizeOrderStatus = normalizeOrderStatus;
 exports.normalizeQuote = normalizeQuote;
+exports.orderStatusParamsFromHistoryItem = orderStatusParamsFromHistoryItem;
 exports.parseUnits = parseUnits;
 exports.resolveMcaDecreaseCollateral = resolveMcaDecreaseCollateral;
 exports.resolveMcaRequiredCollateralDecrease = resolveMcaRequiredCollateralDecrease;
 exports.resolveMcaWithdrawPolicy = resolveMcaWithdrawPolicy;
+exports.resolveOrderStatusLookup = resolveOrderStatusLookup;
+exports.resolveSourceTxHash = resolveSourceTxHash;
+exports.resolveSwapReportRecordId = resolveSwapReportRecordId;
 exports.selectMcaSigner = selectMcaSigner;
 exports.serializeMcaQuoteRequest = serializeMcaQuoteRequest;
 exports.serializeQuoteRequest = serializeQuoteRequest;