@rhea-finance/cross-chain-aggregation-dex 2.1.0 → 2.1.2

package/README.md

@@ -382,7 +382,7 @@ if (result.status === "completed") {
 }
 ```
 
-`"completed"` polls the order-status API after reporting when possible. The SDK prefers the `recordId` returned by `POST /api/swap/report` (same as multi-chain Trade), and only falls back to `orderId`/`router`/`chainId` or source `txHash` when no record id is available. Confidential swaps also require order-status polling when they are same-chain. For confidential Near Intents builds, the SDK uses `deposit.orderId` when present and otherwise uses `deposit.depositAddress` as the status key. If a cross-chain or confidential swap provides none of these identifiers, the SDK throws `INVALID_API_RESPONSE` at the `status` stage instead of treating source-chain confirmation as completion.
+After `POST /api/swap/report` returns an `id`, the SDK always polls `GET /api/swap/order-status?orderId=<report id>`. That report id is the only status key. The SDK does not query by `recordId` or source `txHash`. Confidential swaps also require order-status polling when they are same-chain. For confidential Near Intents builds, the SDK uses `deposit.orderId` when present and otherwise uses `deposit.depositAddress` as the status key. If a cross-chain or confidential swap provides none of these identifiers, the SDK throws `INVALID_API_RESPONSE` at the `status` stage instead of treating source-chain confirmation as completion.
 
 The default polling interval is 5 seconds. There is no default polling timeout, so polling continues until the order reaches a terminal state or the supplied `AbortSignal` is aborted.
 

package/dist/index.d.mts

@@ -375,15 +375,20 @@ interface BuildMcaWithdrawRelayerRequestInput {
 }
 declare function buildMcaWithdrawRelayerRequest(input: BuildMcaWithdrawRelayerRequestInput): SwapBuildRequestRaw;
 
-/** Matches multi-chain Trade: poll after source execution when cross-chain or confidential. */
+/** Poll order-status after a report id, or for tracked swaps that wait past broadcast. */
 declare function shouldPollSwapOrderStatus(input: {
     waitFor?: WaitMode;
     isCrossChain: boolean;
     confidentiality?: string;
+    /** Present when POST /api/swap/report returned a history row id. */
+    reportRecordId?: string;
 }): boolean;
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
-/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+/**
+ * Status queries use `orderId`.
+ * The report response `id` is that orderId and is sent alone.
+ */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {
     recordId?: string | number;

package/dist/index.d.ts

@@ -375,15 +375,20 @@ interface BuildMcaWithdrawRelayerRequestInput {
 }
 declare function buildMcaWithdrawRelayerRequest(input: BuildMcaWithdrawRelayerRequestInput): SwapBuildRequestRaw;
 
-/** Matches multi-chain Trade: poll after source execution when cross-chain or confidential. */
+/** Poll order-status after a report id, or for tracked swaps that wait past broadcast. */
 declare function shouldPollSwapOrderStatus(input: {
     waitFor?: WaitMode;
     isCrossChain: boolean;
     confidentiality?: string;
+    /** Present when POST /api/swap/report returned a history row id. */
+    reportRecordId?: string;
 }): boolean;
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
-/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+/**
+ * Status queries use `orderId`.
+ * The report response `id` is that orderId and is sent alone.
+ */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {
     recordId?: string | number;

package/dist/index.js

@@ -30,6 +30,7 @@ function asSwapSdkError(error, stage) {
 
 // src/utils/orderStatus.ts
 function shouldPollSwapOrderStatus(input) {
+  if (String(input.reportRecordId ?? "").trim()) return true;
   const waitMode = input.waitFor ?? "submitted";
   const requiresOrderStatus = input.isCrossChain || input.confidentiality === "basic";
   return requiresOrderStatus && waitMode !== "submitted";
@@ -47,18 +48,13 @@ function resolveSwapReportRecordId(reportData) {
   return "";
 }
 function buildOrderStatusQuery(params) {
-  const normalizedRecordId = String(params.recordId ?? "").trim();
-  if (normalizedRecordId) {
-    return { recordId: normalizedRecordId };
+  const reportId = String(params.recordId ?? "").trim();
+  if (reportId) {
+    return { orderId: reportId };
   }
-  const query = {};
   const orderId = params.orderId?.trim();
-  const txHash = params.txHash?.trim();
-  if (orderId) {
-    query.orderId = orderId;
-  } else if (txHash) {
-    query.txHash = txHash;
-  }
+  if (!orderId) return {};
+  const query = { orderId };
   const router = params.router?.trim();
   if (router) query.router = router;
   const chainId = params.chainId;
@@ -68,19 +64,17 @@ function buildOrderStatusQuery(params) {
   return query;
 }
 function resolveOrderStatusLookup(input) {
-  const recordId = String(input.recordId ?? "").trim();
-  if (recordId) {
-    return { recordId };
+  const reportId = String(input.recordId ?? "").trim();
+  if (reportId) {
+    return { orderId: reportId };
   }
-  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;
+  if (!orderId) return void 0;
+  const router = input.router?.trim();
   const chainId = input.chainId !== void 0 && input.chainId !== null && String(input.chainId).trim() !== "" ? String(input.chainId).trim() : void 0;
   return {
-    ...orderId ? { orderId } : { txHash },
-    router,
+    orderId,
+    ...router ? { router } : {},
     ...chainId ? { chainId } : {}
   };
 }
@@ -90,19 +84,18 @@ function assertOrderStatusParams(params) {
     throw new SwapSdkError(
       "INVALID_REQUEST",
       "status",
-      "Order status requires recordId, or orderId/txHash with router"
+      "Order status requires orderId"
     );
   }
   return lookup;
 }
 function orderStatusParamsFromHistoryItem(item) {
-  const recordId = String(item.id ?? "").trim();
-  if (recordId) {
-    return { recordId };
+  const reportId = String(item.id ?? "").trim();
+  if (reportId) {
+    return { orderId: reportId };
   }
   return {
     ...item.orderId ? { orderId: item.orderId } : {},
-    ...item.sourceTxHash ? { txHash: item.sourceTxHash } : {},
     ...item.router ? { router: item.router } : {}
   };
 }
@@ -158,18 +151,11 @@ 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) {
+    if (!query.orderId) {
       throw new SwapSdkError(
         "INVALID_REQUEST",
         "status",
-        "Order status requires router when recordId is absent"
+        "Order status requires orderId"
       );
     }
     return this.request("/api/swap/order-status", "status", {
@@ -2306,10 +2292,15 @@ var McaSwapService = class {
       }
       if (input.waitFor === "completed") {
         const statusLookup = resolveOrderStatusLookup({
-          recordId: reportRecordId ?? result.report?.recordId,
-          orderId,
-          router
-        }) ?? { orderId, router };
+          recordId: reportRecordId ?? result.report?.recordId
+        });
+        if (!statusLookup) {
+          throw new SwapSdkError(
+            "INVALID_API_RESPONSE",
+            "status",
+            "MCA withdraw was reported without an id to query"
+          );
+        }
         const status = await this.client.waitForOrder({
           ...statusLookup,
           ...input.orderPolling,
@@ -2533,8 +2524,6 @@ var SwapClient = class {
       emit({ type: "signing-requested", executionId: build.executionId });
       const chainResult = await executor.execute(build.execution, context);
       let orderId = chainResult.orderId ?? build.order?.orderId;
-      let orderRouter = build.order?.router;
-      let orderChainId = build.order?.chainId;
       if (chainResult.signature) {
         if (build.execution.kind !== "evm-signature") {
           throw new SwapSdkError(
@@ -2557,10 +2546,6 @@ var SwapClient = class {
           { signal: input.signal }
         );
         orderId = submitted.orderId;
-        orderRouter = readNonEmptyString(submitted.router) ?? submitRouter;
-        orderChainId = String(
-          submitted.chainId ?? build.execution.request.chainId
-        );
       }
       const result = {
         executionId: build.executionId,
@@ -2586,16 +2571,12 @@ var SwapClient = class {
         });
       }
       const waitMode = input.waitFor ?? "submitted";
-      const shouldPollOrderStatus = shouldPollSwapOrderStatus({
-        waitFor: waitMode,
-        isCrossChain: build.isCrossChain,
-        confidentiality: build.request?.confidentiality
-      });
+      const requiresTrackedStatus = build.isCrossChain || build.request?.confidentiality === "basic";
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
-      const mustReportForStatus = shouldPollOrderStatus && Boolean(reportRequest);
+      const mustReportForStatus = requiresTrackedStatus && waitMode !== "submitted" && Boolean(reportRequest);
       const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
       let reportRecordId;
       if (shouldReportNow && reportRequest) {
@@ -2618,22 +2599,24 @@ var SwapClient = class {
           emit({ type: "warning", executionId: build.executionId, warning });
         }
       }
+      const shouldPollOrderStatus = shouldPollSwapOrderStatus({
+        waitFor: waitMode,
+        isCrossChain: build.isCrossChain,
+        confidentiality: build.request?.confidentiality,
+        reportRecordId
+      });
       const statusLookup = resolveOrderStatusLookup({
-        recordId: reportRecordId ?? result.report?.recordId,
-        orderId,
-        txHash: resolveSourceTxHash(chainResult),
-        router: orderRouter ?? build.router,
-        chainId: orderChainId
+        recordId: reportRecordId ?? result.report?.recordId
       });
       if (shouldPollOrderStatus && !statusLookup) {
         throw new SwapSdkError(
           "INVALID_API_RESPONSE",
           "status",
-          "Swap submitted, but no report record id, status key, or source transaction hash is available",
+          "Swap submitted, but the report response did not include an id to query",
           {
             details: {
               executionId: build.executionId,
-              router: orderRouter ?? build.router
+              router: build.router
             }
           }
         );