@rhea-finance/cross-chain-aggregation-dex 2.0.7 → 2.0.9

package/README.md

@@ -382,7 +382,7 @@ if (result.status === "completed") {
 }
 ```
 
-`"completed"` polls the order-status API whenever the swap has a queryable order reference. 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 does not provide a usable status key, the SDK throws `INVALID_API_RESPONSE` at the `status` stage instead of treating source-chain confirmation as completion.
+`"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.
 
 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.
 
@@ -390,28 +390,41 @@ Set `orderPolling.timeoutMs` only when the application needs a time limit. An ex
 
 ### 3.5 Check final delivery status
 
-If the swap first returns with `"submitted"`, use the returned `orderId` to poll manually:
+If the swap first returns with `"submitted"`, poll manually with the report record id when available:
 
 ```ts
-if (result.orderId) {
+if (result.report?.recordId) {
+  const finalStatus = await client.waitForOrder({
+    recordId: result.report.recordId,
+    intervalMs: 5000,
+    timeoutMs: 600000,
+  });
+  console.log(finalStatus.status);
+} else if (result.orderId) {
   const finalStatus = await client.waitForOrder({
     orderId: result.orderId,
     router: result.router,
     intervalMs: 5000,
     timeoutMs: 600000,
   });
-
   console.log(finalStatus.status);
 }
 ```
 
+For history rows, refresh delivery status with the same record id:
+
+```ts
+const status = await client.getHistoryOrderStatus(historyItem);
+```
+
 For a single status request:
 
 ```ts
-const status = await client.getOrderStatus({
-  orderId: result.orderId!,
-  router: result.router,
-});
+const status = await client.getOrderStatus(
+  result.report?.recordId
+    ? { recordId: result.report.recordId }
+    : { orderId: result.orderId!, router: result.router }
+);
 ```
 
 Terminal statuses are `completed`, `failed`, `refunded`, and `expired`.
@@ -802,7 +815,7 @@ await client.verifyHistoryAuthChallenge(rawVerifyRequest);
 await client.getHistoryRaw(rawHistoryRequest);
 ```
 
-The default reporting mode is `reportMode: "auto"`. If a swap succeeds but reporting fails, `result.report.status` is `"failed"` and a warning is emitted. The SDK does not throw a misleading swap failure. For manual reporting:
+The default reporting mode is `reportMode: "auto"`. If a swap succeeds but reporting fails, `result.report.status` is `"failed"` and a warning is emitted. The SDK does not throw a misleading swap failure. When `waitFor: "completed"` requires order-status polling, the SDK still calls `POST /api/swap/report` first (even in `reportMode: "manual"`) so it can query status by the returned record id. For other manual reporting flows:
 
 ```ts
 const client = new SwapClient({

package/dist/executors/aptos.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface AptosWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/aptos.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface AptosWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/bitcoin.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface BitcoinWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/bitcoin.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface BitcoinWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/evm.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, a3 as EvmTx, ae as TransactionSubmission, a5 as EvmSigningRequest, a4 as EvmApproval, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, a4 as EvmTx, ae as TransactionSubmission, a6 as EvmSigningRequest, a5 as EvmApproval, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface EvmWalletAdapter extends ExecutorErrorAdapter {
     sendTransaction(tx: EvmTx, options: {

package/dist/executors/evm.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, a3 as EvmTx, ae as TransactionSubmission, a5 as EvmSigningRequest, a4 as EvmApproval, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, a4 as EvmTx, ae as TransactionSubmission, a6 as EvmSigningRequest, a5 as EvmApproval, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface EvmWalletAdapter extends ExecutorErrorAdapter {
     sendTransaction(tx: EvmTx, options: {

package/dist/executors/near.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, N as NearTransaction, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, N as NearTransaction, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface NearWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/near.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, N as NearTransaction, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, N as NearTransaction, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface NearWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/solana.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, a6 as SolanaMetadata, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, a7 as SolanaMetadata, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface SolanaWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/solana.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, a6 as SolanaMetadata, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, a7 as SolanaMetadata, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface SolanaWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/sui.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface SuiWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/sui.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface SuiWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/tron.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface TronWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/tron.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface TronWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/zcash.d.mts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.mjs';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.mjs';
 
 interface ZcashWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/executors/zcash.d.ts

@@ -1,4 +1,4 @@
-import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-COkGiqaz.js';
+import { ad as ExecutorErrorAdapter, C as ChainRef, ae as TransactionSubmission, T as TransactionConfirmation, w as ChainExecutor } from '../shared-DpC8G2U4.js';
 
 interface ZcashWalletAdapter extends ExecutorErrorAdapter {
     getChain(): ChainRef | Promise<ChainRef>;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { S as SwapQuoteRequestRaw, a as SwapQuoteDataRaw, b as SwapBuildRequestRaw, c as SwapBuildDataRaw, d as SwapOrderSubmitRequestRaw, e as SwapOrderSubmitDataRaw, f as SwapOrderStatusParamsRaw, g as SwapOrderStatusDataRaw, h as SwapReportRequestRaw, i as SwapReportDataRaw, j as SwapHistoryParamsRaw, k as SwapHistoryDataRaw, l as SwapHistoryAuthChallengeRequestRaw, m as SwapHistoryAuthChallengeRaw, n as SwapHistoryAuthVerifyRequestRaw, o as SwapHistoryAuthTokenRaw, p as SwapFromTokensDataRaw, q as SwapCrossChainToTokensDataRaw, Q as QuoteRequest, r as Quote, s as SwapMcaPayloadRaw, W as WaitMode, O as OrderPollingOptions, t as SwapLifecycleEvent, u as SwapExecutionResult, C as ChainRef, A as AssetRef, B as BaseUnitAmount, v as SwapHistoryRecordRaw, w as ChainExecutor, E as ExecutorRegistry, x as SwapBuild, y as ExecuteSwapInput, z as SwapInput, D as OrderStatusResult, F as WaitForOrderInput, G as SwapHistoryAuthProofRaw, N as NearTransaction, H as SwapMcaRelayerRequestRaw } from './shared-COkGiqaz.mjs';
-export { ac as BuildContext, Z as ChainExecutionResult, a8 as DepositInfo, a4 as EvmApproval, a5 as EvmSigningRequest, a3 as EvmTx, _ as ExecutionContext, a0 as ExecutorIdentityProvider, a1 as ExecutorMessageSigner, $ as MessageSignOptions, a7 as OrderReference, X as OrderStatus, ab as RouteSummary, V as SignRequestPreview, a6 as SolanaMetadata, I as SwapApiResponse, J as SwapApiTokenMetaRaw, P as SwapBuildApproveRaw, aa as SwapExecution, R as SwapHistoryWalletChainFamilyRaw, L as SwapMcaSignerPayloadRaw, a9 as SwapReportContext, M as SwapSigningRequestRaw, K as SwapTokenListRowRaw, U as SwapWarning, T as TransactionConfirmation, a2 as assertBaseUnitAmount, Y as normalizeOrderStatus } from './shared-COkGiqaz.mjs';
+import { S as SwapQuoteRequestRaw, a as SwapQuoteDataRaw, b as SwapBuildRequestRaw, c as SwapBuildDataRaw, d as SwapOrderSubmitRequestRaw, e as SwapOrderSubmitDataRaw, f as SwapOrderStatusParamsRaw, g as SwapOrderStatusDataRaw, h as SwapReportRequestRaw, i as SwapReportDataRaw, j as SwapHistoryParamsRaw, k as SwapHistoryDataRaw, l as SwapHistoryAuthChallengeRequestRaw, m as SwapHistoryAuthChallengeRaw, n as SwapHistoryAuthVerifyRequestRaw, o as SwapHistoryAuthTokenRaw, p as SwapFromTokensDataRaw, q as SwapCrossChainToTokensDataRaw, Q as QuoteRequest, r as Quote, s as SwapMcaPayloadRaw, W as WaitMode, O as OrderPollingOptions, t as SwapLifecycleEvent, u as SwapExecutionResult, C as ChainRef, A as AssetRef, B as BaseUnitAmount, v as SwapHistoryRecordRaw, w as ChainExecutor, E as ExecutorRegistry, x as SwapBuild, y as ExecuteSwapInput, z as SwapInput, D as OrderReference, F as OrderStatusResult, G as WaitForOrderInput, H as SwapHistoryAuthProofRaw, N as NearTransaction, I as SwapMcaRelayerRequestRaw } from './shared-DpC8G2U4.mjs';
+export { ac as BuildContext, _ as ChainExecutionResult, a8 as DepositInfo, a5 as EvmApproval, a6 as EvmSigningRequest, a4 as EvmTx, $ as ExecutionContext, a1 as ExecutorIdentityProvider, a2 as ExecutorMessageSigner, a0 as MessageSignOptions, Y as OrderStatus, ab as RouteSummary, X as SignRequestPreview, a7 as SolanaMetadata, J as SwapApiResponse, K as SwapApiTokenMetaRaw, R as SwapBuildApproveRaw, aa as SwapExecution, U as SwapHistoryWalletChainFamilyRaw, M as SwapMcaSignerPayloadRaw, a9 as SwapReportContext, P as SwapSigningRequestRaw, L as SwapTokenListRowRaw, V as SwapWarning, T as TransactionConfirmation, a3 as assertBaseUnitAmount, Z as normalizeOrderStatus } from './shared-DpC8G2U4.mjs';
 
 type SwapErrorCode = "HTTP_ERROR" | "API_ERROR" | "RATE_LIMITED" | "AUTH_FAILED" | "REQUEST_ABORTED" | "REQUEST_TIMEOUT" | "INVALID_REQUEST" | "INVALID_API_RESPONSE" | "QUOTE_EXPIRED" | "ROUTE_NOT_FOUND" | "EXECUTOR_NOT_FOUND" | "UNSUPPORTED_CHAIN" | "CHAIN_MISMATCH" | "INVALID_TRANSACTION" | "USER_REJECTED" | "INSUFFICIENT_BALANCE" | "APPROVAL_FAILED" | "SIGNING_FAILED" | "BROADCAST_FAILED" | "ORDER_SUBMIT_FAILED" | "ORDER_TIMEOUT" | "REPORT_FAILED";
 type SwapErrorStage = "quote" | "build" | "approve" | "sign" | "broadcast" | "submit" | "report" | "status" | "tokens" | "history";
@@ -268,10 +268,10 @@ declare class SwapClient {
     executeSwap(input: ExecuteSwapInput): Promise<SwapExecutionResult>;
     swap(input: McaSwapInput): Promise<McaSwapResult>;
     swap(input: SwapInput): Promise<SwapExecutionResult>;
-    getOrderStatus(input: {
-        orderId: string;
-        router: string;
-        chainId?: string;
+    getOrderStatus(input: OrderReference & {
+        signal?: AbortSignal;
+    }): Promise<OrderStatusResult>;
+    getHistoryOrderStatus(item: Pick<SwapHistoryItem, "id" | "orderId" | "router" | "sourceTxHash">, options?: {
         signal?: AbortSignal;
     }): Promise<OrderStatusResult>;
     waitForOrder(input: WaitForOrderInput): Promise<OrderStatusResult>;
@@ -375,7 +375,25 @@ interface BuildMcaWithdrawRelayerRequestInput {
 }
 declare function buildMcaWithdrawRelayerRequest(input: BuildMcaWithdrawRelayerRequestInput): SwapBuildRequestRaw;
 
+declare function resolveSwapReportRecordId(reportData: unknown): string;
+type OrderStatusLookup = OrderReference;
+/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
+declare function resolveOrderStatusLookup(input: {
+    recordId?: string | number;
+    orderId?: string;
+    txHash?: string;
+    router?: string;
+    chainId?: string | number;
+}): OrderReference | undefined;
+declare function assertOrderStatusParams(params: SwapOrderStatusParamsRaw | OrderReference): OrderReference;
+declare function orderStatusParamsFromHistoryItem(item: Pick<SwapHistoryItem, "id" | "orderId" | "router" | "sourceTxHash">): OrderReference;
+declare function resolveSourceTxHash(input: {
+    txHash?: string;
+    txHashes?: string[];
+}): string | undefined;
+
 declare function parseUnits(value: string, decimals: number): BaseUnitAmount;
 declare function formatUnits(value: BaseUnitAmount, decimals: number): string;
 
-export { ApiClient, type ApiClientConfig, type ApiRequestOptions, AssetRef, BaseUnitAmount, type BuildMcaWithdrawRelayerRequestInput, type BuildNearMcaWithdrawTransactionsInput, type BuildSwapInput, ChainExecutor, ChainRef, DEFAULT_MCA_SIGNER_PRIORITY, ExecuteSwapInput, ExecutorRegistry, type ExtractMcaWithdrawDepositAddressInput, type HistoryRequest, type HistoryStatus, type McaDepositCollateral, type McaDepositQuote, type McaDepositQuoteRequest, type McaFlow, type McaQuote, type McaQuoteRequest, type McaSignerChain, type McaSignerIdentity, type McaSwapInput, type McaSwapResult, type McaWalletDescriptor, type McaWalletKey, type McaWithdrawCollateral, type McaWithdrawNearQuote, type McaWithdrawQuoteRequest, type McaWithdrawRelayerQuote, NearTransaction, OrderPollingOptions, OrderStatusResult, Quote, QuoteRequest, type ResolveMcaRequiredCollateralDecreaseInput, type ResolveMcaWithdrawPolicyInput, type RetryConfig, type SdkLogEntry, type SdkLogLevel, type SdkLogger, SwapBuild, SwapBuildDataRaw, SwapBuildRequestRaw, SwapClient, type SwapClientConfig, SwapCrossChainToTokensDataRaw, type SwapErrorCode, type SwapErrorStage, SwapExecutionResult, SwapFromTokensDataRaw, SwapHistoryAuthChallengeRaw, SwapHistoryAuthChallengeRequestRaw, SwapHistoryAuthProofRaw, SwapHistoryAuthTokenRaw, SwapHistoryAuthVerifyRequestRaw, SwapHistoryDataRaw, type SwapHistoryItem, type SwapHistoryPage, SwapHistoryParamsRaw, SwapHistoryRecordRaw, SwapInput, SwapLifecycleEvent, SwapMcaPayloadRaw, SwapMcaRelayerRequestRaw, SwapOrderStatusDataRaw, SwapOrderStatusParamsRaw, SwapOrderSubmitDataRaw, SwapOrderSubmitRequestRaw, SwapQuoteDataRaw, SwapQuoteRequestRaw, SwapReportDataRaw, SwapReportRequestRaw, SwapSdkError, type SwapSdkErrorOptions, type SwapTokenListItem, type TokenListRequest, WaitForOrderInput, WaitMode, asSwapSdkError, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeQuote, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, toApiAssetAddress, toApiChain };
+export { ApiClient, type ApiClientConfig, type ApiRequestOptions, AssetRef, BaseUnitAmount, type BuildMcaWithdrawRelayerRequestInput, type BuildNearMcaWithdrawTransactionsInput, type BuildSwapInput, ChainExecutor, ChainRef, DEFAULT_MCA_SIGNER_PRIORITY, ExecuteSwapInput, ExecutorRegistry, type ExtractMcaWithdrawDepositAddressInput, type HistoryRequest, type HistoryStatus, type McaDepositCollateral, type McaDepositQuote, type McaDepositQuoteRequest, type McaFlow, type McaQuote, type McaQuoteRequest, type McaSignerChain, type McaSignerIdentity, type McaSwapInput, type McaSwapResult, type McaWalletDescriptor, type McaWalletKey, type McaWithdrawCollateral, type McaWithdrawNearQuote, type McaWithdrawQuoteRequest, type McaWithdrawRelayerQuote, NearTransaction, OrderPollingOptions, OrderReference, type OrderStatusLookup, OrderStatusResult, Quote, QuoteRequest, type ResolveMcaRequiredCollateralDecreaseInput, type ResolveMcaWithdrawPolicyInput, type RetryConfig, type SdkLogEntry, type SdkLogLevel, type SdkLogger, SwapBuild, SwapBuildDataRaw, SwapBuildRequestRaw, SwapClient, type SwapClientConfig, SwapCrossChainToTokensDataRaw, type SwapErrorCode, type SwapErrorStage, SwapExecutionResult, SwapFromTokensDataRaw, SwapHistoryAuthChallengeRaw, SwapHistoryAuthChallengeRequestRaw, SwapHistoryAuthProofRaw, SwapHistoryAuthTokenRaw, SwapHistoryAuthVerifyRequestRaw, SwapHistoryDataRaw, type SwapHistoryItem, type SwapHistoryPage, SwapHistoryParamsRaw, SwapHistoryRecordRaw, SwapInput, SwapLifecycleEvent, SwapMcaPayloadRaw, SwapMcaRelayerRequestRaw, SwapOrderStatusDataRaw, SwapOrderStatusParamsRaw, SwapOrderSubmitDataRaw, SwapOrderSubmitRequestRaw, SwapQuoteDataRaw, SwapQuoteRequestRaw, SwapReportDataRaw, SwapReportRequestRaw, SwapSdkError, type SwapSdkErrorOptions, type SwapTokenListItem, type TokenListRequest, WaitForOrderInput, WaitMode, asSwapSdkError, assertOrderStatusParams, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, buildOrderStatusQuery, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeQuote, orderStatusParamsFromHistoryItem, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, resolveOrderStatusLookup, resolveSourceTxHash, resolveSwapReportRecordId, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, toApiAssetAddress, toApiChain };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as SwapQuoteRequestRaw, a as SwapQuoteDataRaw, b as SwapBuildRequestRaw, c as SwapBuildDataRaw, d as SwapOrderSubmitRequestRaw, e as SwapOrderSubmitDataRaw, f as SwapOrderStatusParamsRaw, g as SwapOrderStatusDataRaw, h as SwapReportRequestRaw, i as SwapReportDataRaw, j as SwapHistoryParamsRaw, k as SwapHistoryDataRaw, l as SwapHistoryAuthChallengeRequestRaw, m as SwapHistoryAuthChallengeRaw, n as SwapHistoryAuthVerifyRequestRaw, o as SwapHistoryAuthTokenRaw, p as SwapFromTokensDataRaw, q as SwapCrossChainToTokensDataRaw, Q as QuoteRequest, r as Quote, s as SwapMcaPayloadRaw, W as WaitMode, O as OrderPollingOptions, t as SwapLifecycleEvent, u as SwapExecutionResult, C as ChainRef, A as AssetRef, B as BaseUnitAmount, v as SwapHistoryRecordRaw, w as ChainExecutor, E as ExecutorRegistry, x as SwapBuild, y as ExecuteSwapInput, z as SwapInput, D as OrderStatusResult, F as WaitForOrderInput, G as SwapHistoryAuthProofRaw, N as NearTransaction, H as SwapMcaRelayerRequestRaw } from './shared-COkGiqaz.js';
-export { ac as BuildContext, Z as ChainExecutionResult, a8 as DepositInfo, a4 as EvmApproval, a5 as EvmSigningRequest, a3 as EvmTx, _ as ExecutionContext, a0 as ExecutorIdentityProvider, a1 as ExecutorMessageSigner, $ as MessageSignOptions, a7 as OrderReference, X as OrderStatus, ab as RouteSummary, V as SignRequestPreview, a6 as SolanaMetadata, I as SwapApiResponse, J as SwapApiTokenMetaRaw, P as SwapBuildApproveRaw, aa as SwapExecution, R as SwapHistoryWalletChainFamilyRaw, L as SwapMcaSignerPayloadRaw, a9 as SwapReportContext, M as SwapSigningRequestRaw, K as SwapTokenListRowRaw, U as SwapWarning, T as TransactionConfirmation, a2 as assertBaseUnitAmount, Y as normalizeOrderStatus } from './shared-COkGiqaz.js';
+import { S as SwapQuoteRequestRaw, a as SwapQuoteDataRaw, b as SwapBuildRequestRaw, c as SwapBuildDataRaw, d as SwapOrderSubmitRequestRaw, e as SwapOrderSubmitDataRaw, f as SwapOrderStatusParamsRaw, g as SwapOrderStatusDataRaw, h as SwapReportRequestRaw, i as SwapReportDataRaw, j as SwapHistoryParamsRaw, k as SwapHistoryDataRaw, l as SwapHistoryAuthChallengeRequestRaw, m as SwapHistoryAuthChallengeRaw, n as SwapHistoryAuthVerifyRequestRaw, o as SwapHistoryAuthTokenRaw, p as SwapFromTokensDataRaw, q as SwapCrossChainToTokensDataRaw, Q as QuoteRequest, r as Quote, s as SwapMcaPayloadRaw, W as WaitMode, O as OrderPollingOptions, t as SwapLifecycleEvent, u as SwapExecutionResult, C as ChainRef, A as AssetRef, B as BaseUnitAmount, v as SwapHistoryRecordRaw, w as ChainExecutor, E as ExecutorRegistry, x as SwapBuild, y as ExecuteSwapInput, z as SwapInput, D as OrderReference, F as OrderStatusResult, G as WaitForOrderInput, H as SwapHistoryAuthProofRaw, N as NearTransaction, I as SwapMcaRelayerRequestRaw } from './shared-DpC8G2U4.js';
+export { ac as BuildContext, _ as ChainExecutionResult, a8 as DepositInfo, a5 as EvmApproval, a6 as EvmSigningRequest, a4 as EvmTx, $ as ExecutionContext, a1 as ExecutorIdentityProvider, a2 as ExecutorMessageSigner, a0 as MessageSignOptions, Y as OrderStatus, ab as RouteSummary, X as SignRequestPreview, a7 as SolanaMetadata, J as SwapApiResponse, K as SwapApiTokenMetaRaw, R as SwapBuildApproveRaw, aa as SwapExecution, U as SwapHistoryWalletChainFamilyRaw, M as SwapMcaSignerPayloadRaw, a9 as SwapReportContext, P as SwapSigningRequestRaw, L as SwapTokenListRowRaw, V as SwapWarning, T as TransactionConfirmation, a3 as assertBaseUnitAmount, Z as normalizeOrderStatus } from './shared-DpC8G2U4.js';
 
 type SwapErrorCode = "HTTP_ERROR" | "API_ERROR" | "RATE_LIMITED" | "AUTH_FAILED" | "REQUEST_ABORTED" | "REQUEST_TIMEOUT" | "INVALID_REQUEST" | "INVALID_API_RESPONSE" | "QUOTE_EXPIRED" | "ROUTE_NOT_FOUND" | "EXECUTOR_NOT_FOUND" | "UNSUPPORTED_CHAIN" | "CHAIN_MISMATCH" | "INVALID_TRANSACTION" | "USER_REJECTED" | "INSUFFICIENT_BALANCE" | "APPROVAL_FAILED" | "SIGNING_FAILED" | "BROADCAST_FAILED" | "ORDER_SUBMIT_FAILED" | "ORDER_TIMEOUT" | "REPORT_FAILED";
 type SwapErrorStage = "quote" | "build" | "approve" | "sign" | "broadcast" | "submit" | "report" | "status" | "tokens" | "history";
@@ -268,10 +268,10 @@ declare class SwapClient {
     executeSwap(input: ExecuteSwapInput): Promise<SwapExecutionResult>;
     swap(input: McaSwapInput): Promise<McaSwapResult>;
     swap(input: SwapInput): Promise<SwapExecutionResult>;
-    getOrderStatus(input: {
-        orderId: string;
-        router: string;
-        chainId?: string;
+    getOrderStatus(input: OrderReference & {
+        signal?: AbortSignal;
+    }): Promise<OrderStatusResult>;
+    getHistoryOrderStatus(item: Pick<SwapHistoryItem, "id" | "orderId" | "router" | "sourceTxHash">, options?: {
         signal?: AbortSignal;
     }): Promise<OrderStatusResult>;
     waitForOrder(input: WaitForOrderInput): Promise<OrderStatusResult>;
@@ -375,7 +375,25 @@ interface BuildMcaWithdrawRelayerRequestInput {
 }
 declare function buildMcaWithdrawRelayerRequest(input: BuildMcaWithdrawRelayerRequestInput): SwapBuildRequestRaw;
 
+declare function resolveSwapReportRecordId(reportData: unknown): string;
+type OrderStatusLookup = OrderReference;
+/** Matches multi-chain-lending `resolveSwapOrderStatusQuery` query shape. */
+declare function buildOrderStatusQuery(params: SwapOrderStatusParamsRaw): Record<string, string | number>;
+declare function resolveOrderStatusLookup(input: {
+    recordId?: string | number;
+    orderId?: string;
+    txHash?: string;
+    router?: string;
+    chainId?: string | number;
+}): OrderReference | undefined;
+declare function assertOrderStatusParams(params: SwapOrderStatusParamsRaw | OrderReference): OrderReference;
+declare function orderStatusParamsFromHistoryItem(item: Pick<SwapHistoryItem, "id" | "orderId" | "router" | "sourceTxHash">): OrderReference;
+declare function resolveSourceTxHash(input: {
+    txHash?: string;
+    txHashes?: string[];
+}): string | undefined;
+
 declare function parseUnits(value: string, decimals: number): BaseUnitAmount;
 declare function formatUnits(value: BaseUnitAmount, decimals: number): string;
 
-export { ApiClient, type ApiClientConfig, type ApiRequestOptions, AssetRef, BaseUnitAmount, type BuildMcaWithdrawRelayerRequestInput, type BuildNearMcaWithdrawTransactionsInput, type BuildSwapInput, ChainExecutor, ChainRef, DEFAULT_MCA_SIGNER_PRIORITY, ExecuteSwapInput, ExecutorRegistry, type ExtractMcaWithdrawDepositAddressInput, type HistoryRequest, type HistoryStatus, type McaDepositCollateral, type McaDepositQuote, type McaDepositQuoteRequest, type McaFlow, type McaQuote, type McaQuoteRequest, type McaSignerChain, type McaSignerIdentity, type McaSwapInput, type McaSwapResult, type McaWalletDescriptor, type McaWalletKey, type McaWithdrawCollateral, type McaWithdrawNearQuote, type McaWithdrawQuoteRequest, type McaWithdrawRelayerQuote, NearTransaction, OrderPollingOptions, OrderStatusResult, Quote, QuoteRequest, type ResolveMcaRequiredCollateralDecreaseInput, type ResolveMcaWithdrawPolicyInput, type RetryConfig, type SdkLogEntry, type SdkLogLevel, type SdkLogger, SwapBuild, SwapBuildDataRaw, SwapBuildRequestRaw, SwapClient, type SwapClientConfig, SwapCrossChainToTokensDataRaw, type SwapErrorCode, type SwapErrorStage, SwapExecutionResult, SwapFromTokensDataRaw, SwapHistoryAuthChallengeRaw, SwapHistoryAuthChallengeRequestRaw, SwapHistoryAuthProofRaw, SwapHistoryAuthTokenRaw, SwapHistoryAuthVerifyRequestRaw, SwapHistoryDataRaw, type SwapHistoryItem, type SwapHistoryPage, SwapHistoryParamsRaw, SwapHistoryRecordRaw, SwapInput, SwapLifecycleEvent, SwapMcaPayloadRaw, SwapMcaRelayerRequestRaw, SwapOrderStatusDataRaw, SwapOrderStatusParamsRaw, SwapOrderSubmitDataRaw, SwapOrderSubmitRequestRaw, SwapQuoteDataRaw, SwapQuoteRequestRaw, SwapReportDataRaw, SwapReportRequestRaw, SwapSdkError, type SwapSdkErrorOptions, type SwapTokenListItem, type TokenListRequest, WaitForOrderInput, WaitMode, asSwapSdkError, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeQuote, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, toApiAssetAddress, toApiChain };
+export { ApiClient, type ApiClientConfig, type ApiRequestOptions, AssetRef, BaseUnitAmount, type BuildMcaWithdrawRelayerRequestInput, type BuildNearMcaWithdrawTransactionsInput, type BuildSwapInput, ChainExecutor, ChainRef, DEFAULT_MCA_SIGNER_PRIORITY, ExecuteSwapInput, ExecutorRegistry, type ExtractMcaWithdrawDepositAddressInput, type HistoryRequest, type HistoryStatus, type McaDepositCollateral, type McaDepositQuote, type McaDepositQuoteRequest, type McaFlow, type McaQuote, type McaQuoteRequest, type McaSignerChain, type McaSignerIdentity, type McaSwapInput, type McaSwapResult, type McaWalletDescriptor, type McaWalletKey, type McaWithdrawCollateral, type McaWithdrawNearQuote, type McaWithdrawQuoteRequest, type McaWithdrawRelayerQuote, NearTransaction, OrderPollingOptions, OrderReference, type OrderStatusLookup, OrderStatusResult, Quote, QuoteRequest, type ResolveMcaRequiredCollateralDecreaseInput, type ResolveMcaWithdrawPolicyInput, type RetryConfig, type SdkLogEntry, type SdkLogLevel, type SdkLogger, SwapBuild, SwapBuildDataRaw, SwapBuildRequestRaw, SwapClient, type SwapClientConfig, SwapCrossChainToTokensDataRaw, type SwapErrorCode, type SwapErrorStage, SwapExecutionResult, SwapFromTokensDataRaw, SwapHistoryAuthChallengeRaw, SwapHistoryAuthChallengeRequestRaw, SwapHistoryAuthProofRaw, SwapHistoryAuthTokenRaw, SwapHistoryAuthVerifyRequestRaw, SwapHistoryDataRaw, type SwapHistoryItem, type SwapHistoryPage, SwapHistoryParamsRaw, SwapHistoryRecordRaw, SwapInput, SwapLifecycleEvent, SwapMcaPayloadRaw, SwapMcaRelayerRequestRaw, SwapOrderStatusDataRaw, SwapOrderStatusParamsRaw, SwapOrderSubmitDataRaw, SwapOrderSubmitRequestRaw, SwapQuoteDataRaw, SwapQuoteRequestRaw, SwapReportDataRaw, SwapReportRequestRaw, SwapSdkError, type SwapSdkErrorOptions, type SwapTokenListItem, type TokenListRequest, WaitForOrderInput, WaitMode, asSwapSdkError, assertOrderStatusParams, buildMcaWithdrawRelayerRequest, buildNearMcaWithdrawTransactions, buildOrderStatusQuery, createExecutionId, extractMcaWithdrawBusiness, extractMcaWithdrawDepositAddress, extractMcaWithdrawSignerWallet, formatMcaWallet, formatUnits, fromApiChain, isSameMcaSignerIdentity, normalizeBuild, normalizeCrossChainToTokenList, normalizeFromTokenList, normalizeHistory, normalizeHistoryStatus, normalizeMcaQuote, normalizeQuote, orderStatusParamsFromHistoryItem, parseUnits, resolveMcaDecreaseCollateral, resolveMcaRequiredCollateralDecrease, resolveMcaWithdrawPolicy, resolveOrderStatusLookup, resolveSourceTxHash, resolveSwapReportRecordId, selectMcaSigner, serializeMcaQuoteRequest, serializeQuoteRequest, toApiAssetAddress, toApiChain };

package/dist/index.js

@@ -28,6 +28,86 @@ 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 record = reportData;
+  for (const key of ["id", "recordId", "record_id"]) {
+    const value = record[key];
+    if (value !== void 0 && value !== null) {
+      const normalized = String(value).trim();
+      if (normalized) return normalized;
+    }
+  }
+  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 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,
@@ -72,15 +152,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 = {}) {
@@ -1981,9 +2072,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
       });
@@ -2209,10 +2304,19 @@ var McaSwapService = class {
         raw
       };
       emit({ type: "submitted", executionId, orderId });
-      if (this.reportMode === "auto") {
+      const mustReportForStatus = input.waitFor === "completed";
+      const shouldReportNow = this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
+      let reportRecordId;
+      if (shouldReportNow) {
         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",
@@ -2224,9 +2328,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
         });
@@ -2500,14 +2608,25 @@ var SwapClient = class {
           executionId: build.executionId
         });
       }
+      const waitsForCompletion = (input.waitFor ?? "submitted") === "completed";
+      const requiresOrderStatus = build.isCrossChain || build.request?.confidentiality === "basic";
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
         this.reportRequests.set(build.executionId, reportRequest);
       }
-      if (this.reportMode === "auto" && reportRequest) {
+      const mustReportForStatus = waitsForCompletion && requiresOrderStatus && Boolean(reportRequest);
+      const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
+      let reportRecordId;
+      if (shouldReportNow && 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",
@@ -2518,27 +2637,29 @@ var SwapClient = class {
           emit({ type: "warning", executionId: build.executionId, warning });
         }
       }
-      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
         });
@@ -2576,21 +2697,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;
@@ -2627,7 +2749,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);
@@ -2638,7 +2760,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);
@@ -2800,8 +2928,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;
@@ -2818,10 +2948,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;