@rhea-finance/cross-chain-aggregation-dex 2.1.1 → 2.1.3

package/README.md

@@ -382,7 +382,7 @@ if (result.status === "completed") {
 }
 ```
 
-After `POST /api/swap/report` returns an `id`, the SDK always polls `GET /api/swap/order-status?recordId=...`, including when `waitFor` is `"submitted"`. `"completed"` and `"source-confirmed"` also poll for cross-chain and confidential swaps when no report id is available, falling back to `orderId`/`router`/`chainId` 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.
+After `POST /api/swap/report` returns an `id`, the SDK polls `GET /api/swap/order-status?orderId=<report id>&router=<swap router>`. The router comes from the swap response. 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

@@ -385,7 +385,9 @@ declare function shouldPollSwapOrderStatus(input: {
 }): boolean;
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
-/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+/**
+ * Status queries use the report id as `orderId`, plus the swap response `router`.
+ */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {
     recordId?: string | number;

package/dist/index.d.ts

@@ -385,7 +385,9 @@ declare function shouldPollSwapOrderStatus(input: {
 }): boolean;
 declare function resolveSwapReportRecordId(reportData: unknown): string;
 type OrderStatusLookup = OrderReference;
-/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+/**
+ * Status queries use the report id as `orderId`, plus the swap response `router`.
+ */
 declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
 declare function resolveOrderStatusLookup(input: {
     recordId?: string | number;

package/dist/index.js

@@ -48,40 +48,35 @@ function resolveSwapReportRecordId(reportData) {
   return "";
 }
 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 reportId = String(params.recordId ?? "").trim();
+  const orderId = reportId || params.orderId?.trim();
+  if (!orderId) return {};
+  const query = { orderId };
   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;
+  if (!reportId) {
+    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 reportId = String(input.recordId ?? "").trim();
+  const orderId = reportId || input.orderId?.trim();
+  if (!orderId) return void 0;
   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;
+  const chainId = reportId ? void 0 : input.chainId !== void 0 && input.chainId !== null && String(input.chainId).trim() !== "" ? String(input.chainId).trim() : void 0;
+  if (reportId) {
+    return {
+      orderId,
+      ...router ? { router } : {}
+    };
+  }
   return {
-    ...orderId ? { orderId } : { txHash },
-    router,
+    orderId,
+    ...router ? { router } : {},
     ...chainId ? { chainId } : {}
   };
 }
@@ -91,19 +86,21 @@ 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,
+      ...item.router ? { router: item.router } : {}
+    };
   }
   return {
     ...item.orderId ? { orderId: item.orderId } : {},
-    ...item.sourceTxHash ? { txHash: item.sourceTxHash } : {},
     ...item.router ? { router: item.router } : {}
   };
 }
@@ -159,18 +156,11 @@ var ApiClient = class {
   }
   getOrderStatus(params, options = {}) {
     const query = buildOrderStatusQuery(params);
-    if (!query.recordId && !query.orderId && !query.txHash) {
+    if (!query.orderId) {
       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"
+        "Order status requires orderId"
       );
     }
     return this.request("/api/swap/order-status", "status", {
@@ -2308,9 +2298,15 @@ var McaSwapService = class {
       if (input.waitFor === "completed") {
         const statusLookup = resolveOrderStatusLookup({
           recordId: reportRecordId ?? result.report?.recordId,
-          orderId,
           router
-        }) ?? { orderId, router };
+        });
+        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,
@@ -2534,8 +2530,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(
@@ -2558,10 +2552,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,
@@ -2623,20 +2613,17 @@ var SwapClient = class {
       });
       const statusLookup = resolveOrderStatusLookup({
         recordId: reportRecordId ?? result.report?.recordId,
-        orderId,
-        txHash: resolveSourceTxHash(chainResult),
-        router: orderRouter ?? build.router,
-        chainId: orderChainId
+        router: build.order?.router ?? build.router
       });
       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
             }
           }
         );