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

package/dist/index.js

@@ -50,7 +50,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 +58,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
@@ -118,6 +118,22 @@ var ApiClient = class {
       body
     });
   }
+  getFromTokenRows(chainId, options = {}) {
+    return this.request("/get_chain_prices", "tokens", {
+      ...options,
+      method: "GET",
+      retryableOperation: true,
+      query: { chain: chainId }
+    });
+  }
+  getCrossChainToTokenRows(chainId, options = {}) {
+    return this.request("/api/swap/supported_to_tokens", "tokens", {
+      ...options,
+      method: "GET",
+      retryableOperation: true,
+      query: { chain: chainId }
+    });
+  }
   async request(path, stage, options) {
     const url = this.buildUrl(path, options.query);
     const headers = await this.buildHeaders(
@@ -657,7 +673,7 @@ function normalizeBuild(raw, executionId = createExecutionId(), request) {
     const lane = laneFromChainType(common.chainType, fromChain);
     assertLaneMatchesChain(lane, fromChain);
     const execution = normalizeExecution(raw, lane, fromChain);
-    const order = normalizeOrder(raw, execution);
+    const order = normalizeOrder(raw, execution, request);
     const deposit = normalizeDeposit(raw.deposit);
     return {
       executionId,
@@ -888,11 +904,12 @@ function assertKind(actual, allowed) {
     );
   }
 }
-function normalizeOrder(raw, execution) {
+function normalizeOrder(raw, execution, request) {
   const depositOrderId = readRecordString(raw.deposit, "orderId");
-  const orderId = raw.orderId ?? depositOrderId;
-  if (!orderId) return void 0;
   const router = raw.statusRouter ?? (execution.kind === "evm-signature" ? execution.request.router : void 0) ?? raw.router;
+  const confidentialNearIntentsStatusKey = request?.confidentiality === "basic" && router.toLowerCase().includes("nearintents") ? readRecordString(raw.deposit, "depositAddress") : void 0;
+  const orderId = raw.orderId ?? depositOrderId ?? confidentialNearIntentsStatusKey;
+  if (!orderId) return void 0;
   const chainId = execution.kind === "evm-signature" ? String(execution.request.chainId) : execution.kind === "evm-transaction" ? String(execution.tx.chainId) : void 0;
   return { orderId, router, ...chainId ? { chainId } : {} };
 }
@@ -952,6 +969,8 @@ function assertBaseUnitAmount(value) {
 
 // src/normalizers/quote.ts
 var DEFAULT_QUOTE_WAITING_TIME_MS = 3e3;
+var DEFAULT_SAME_CHAIN_TIMEOUT_MS = 500;
+var DEFAULT_CROSS_CHAIN_TIMEOUT_MS = 3e3;
 function serializeQuoteRequest(request) {
   validateQuoteRequest(request);
   return {
@@ -963,6 +982,8 @@ function serializeQuoteRequest(request) {
     amountIn: request.amountIn,
     slippage: request.slippageBps,
     quoteWaitingTimeMs: request.quoteWaitingTimeMs ?? DEFAULT_QUOTE_WAITING_TIME_MS,
+    sameChainTimeoutMs: request.sameChainTimeoutMs ?? DEFAULT_SAME_CHAIN_TIMEOUT_MS,
+    crossChainTimeoutMs: request.crossChainTimeoutMs ?? DEFAULT_CROSS_CHAIN_TIMEOUT_MS,
     ...request.confidentiality ? { confidentiality: request.confidentiality } : {},
     sender: request.sender.trim(),
     ...request.recipient?.trim() ? { recipient: request.recipient.trim() } : {}
@@ -974,7 +995,11 @@ function normalizeQuote(request, raw, receivedAt = Date.now()) {
     throw invalidQuote("Quote response does not contain a valid best route");
   }
   const quoteId = readOptionalString(raw.bestQuote.quoteId);
-  const apiRequest = Object.freeze({ ...serializeQuoteRequest(request) });
+  const apiRequest = { ...serializeQuoteRequest(request) };
+  delete apiRequest.quoteWaitingTimeMs;
+  delete apiRequest.sameChainTimeoutMs;
+  delete apiRequest.crossChainTimeoutMs;
+  Object.freeze(apiRequest);
   const buildContext = Object.freeze({
     request: apiRequest,
     router: bestRoute.router,
@@ -1042,6 +1067,14 @@ function validateQuoteRequest(request) {
       "quoteWaitingTimeMs must be a non-negative integer"
     );
   }
+  validateQuoteTimingParameter(
+    request.sameChainTimeoutMs,
+    "sameChainTimeoutMs"
+  );
+  validateQuoteTimingParameter(
+    request.crossChainTimeoutMs,
+    "crossChainTimeoutMs"
+  );
   if (!request.sender.trim()) {
     throw new SwapSdkError(
       "INVALID_REQUEST",
@@ -1064,6 +1097,15 @@ function validateQuoteRequest(request) {
     );
   }
 }
+function validateQuoteTimingParameter(value, field) {
+  if (value !== void 0 && (!Number.isFinite(value) || !Number.isInteger(value) || value < 0)) {
+    throw new SwapSdkError(
+      "INVALID_REQUEST",
+      "quote",
+      `${field} must be a non-negative integer`
+    );
+  }
+}
 function normalizeRoute(raw, required) {
   const router = readOptionalString(raw.router);
   const amountOutValue = raw.amountOut ?? raw.estimatedOut;
@@ -1236,6 +1278,137 @@ function normalizeTimestamp(value) {
   return Number.isNaN(date.getTime()) ? void 0 : date.toISOString();
 }
 
+// src/normalizers/tokens.ts
+var TOKEN_LIST_CHAIN_METADATA = /* @__PURE__ */ new Map([
+  [1, { chain: "1", blockchain: "eth" }],
+  [10, { chain: "10", blockchain: "op" }],
+  [43114, { chain: "43114", blockchain: "avax" }],
+  [4663, { chain: "4663", blockchain: "robinhood" }],
+  [747474, { chain: "747474", blockchain: "katana" }],
+  [146, { chain: "146", blockchain: "sonic" }],
+  [130, { chain: "130", blockchain: "unichain" }],
+  [1672, { chain: "1672", blockchain: "pharos" }],
+  [4217, { chain: "4217", blockchain: "tempo" }],
+  [56, { chain: "56", blockchain: "bsc" }],
+  [100, { chain: "100", blockchain: "gnosis" }],
+  [137, { chain: "137", blockchain: "pol" }],
+  [143, { chain: "143", blockchain: "monad" }],
+  [196, { chain: "196", blockchain: "xlayer" }],
+  [8453, { chain: "8453", blockchain: "base" }],
+  [9745, { chain: "9745", blockchain: "plasma" }],
+  [42161, { chain: "42161", blockchain: "arb" }],
+  [80094, { chain: "80094", blockchain: "bera" }],
+  [195, { chain: "tron", blockchain: "tron" }],
+  [501, { chain: "solana", blockchain: "sol" }],
+  [784, { chain: "sui", blockchain: "sui" }],
+  [900001, { chain: "near", blockchain: "near" }],
+  [900002, { chain: "btc", blockchain: "btc" }],
+  [900010, { chain: "zcash", blockchain: "zec" }],
+  [900012, { chain: "aptos", blockchain: "aptos" }]
+]);
+function normalizeFromTokenList(raw, chainId) {
+  if (!isRecord2(raw) || Array.isArray(raw)) {
+    throw invalidTokenList("From-token response data must be an object");
+  }
+  return normalizeRows(Object.values(raw), chainId);
+}
+function normalizeCrossChainToTokenList(raw, chainId) {
+  if (!isRecord2(raw) || !Array.isArray(raw.tokens)) {
+    throw invalidTokenList(
+      "Cross-chain to-token response data must contain a tokens array"
+    );
+  }
+  return normalizeRows(raw.tokens, chainId);
+}
+function normalizeRows(rows, chainId) {
+  const tokens = rows.map((row) => normalizeRow(row, chainId)).filter((token) => token !== void 0);
+  if (rows.length > 0 && tokens.length === 0) {
+    throw invalidTokenList("Token-list response contains no valid token rows");
+  }
+  return tokens;
+}
+function normalizeRow(value, chainId) {
+  if (!isRecord2(value)) return void 0;
+  const row = value;
+  const assetId = readString(row.assetId) ?? readString(row.address) ?? readString(row.contractAddress) ?? readString(row.coinType);
+  const symbol = readString(row.symbol);
+  const decimals = readDecimals(row.decimals);
+  if (!assetId || !symbol || decimals === void 0) return void 0;
+  const metadata = TOKEN_LIST_CHAIN_METADATA.get(chainId);
+  const chain = metadata?.chain ?? String(chainId);
+  const blockchain = readString(row.blockchain)?.toLowerCase() ?? metadata?.blockchain ?? String(chainId);
+  const rawAddress = readString(row.contractAddress) ?? readString(row.address) ?? readString(row.coinType);
+  const isNative = isNativeToken({
+    row,
+    chain,
+    blockchain,
+    assetId,
+    rawAddress,
+    symbol
+  });
+  const sources = Array.isArray(row.sources) ? row.sources.filter(
+    (source) => typeof source === "string" && source.trim().length > 0
+  ) : readString(row.platform) ? [readString(row.platform)] : [];
+  const price = typeof row.price === "string" || typeof row.price === "number" ? row.price : null;
+  const priceUpdatedAt = typeof row.updated_at === "number" && Number.isFinite(row.updated_at) ? row.updated_at : null;
+  return {
+    chain,
+    address: assetId,
+    symbol,
+    decimals,
+    isNative,
+    tokenListChainId: chainId,
+    blockchain,
+    assetId,
+    contractAddress: isNative ? null : rawAddress ?? null,
+    coinType: readString(row.coinType) ?? null,
+    name: readString(row.name) ?? null,
+    logoURI: readString(row.logoURI) ?? null,
+    price,
+    priceUpdatedAt,
+    sources,
+    raw: { ...row }
+  };
+}
+function isNativeToken(input) {
+  if (input.row.isNative === true) return true;
+  const address = (input.rawAddress ?? "").toLowerCase();
+  const assetId = input.assetId.toLowerCase();
+  const coinType = readString(input.row.coinType)?.toLowerCase() ?? "";
+  if (/^[1-9]\d*$/.test(input.chain)) {
+    return address === "0x0000000000000000000000000000000000000000" || address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" || (input.blockchain === "pol" || input.blockchain === "polygon") && address === "0x0000000000000000000000000000000000001010";
+  }
+  if (input.chain === "solana") {
+    return address === "11111111111111111111111111111111" || assetId === "nep141:sol.omft.near";
+  }
+  if (input.chain === "tron") {
+    return input.symbol.toUpperCase() === "TRX";
+  }
+  if (input.chain === "sui") {
+    return address.endsWith("::sui::sui");
+  }
+  if (input.chain === "aptos") {
+    if (coinType === "0x1::aptos_coin::aptoscoin") return true;
+    if (!/^0x[0-9a-f]+$/.test(address)) return false;
+    const compactAddress = address.slice(2).replace(/^0+/, "") || "0";
+    return compactAddress === "a";
+  }
+  return false;
+}
+function readString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function readDecimals(value) {
+  const decimals = typeof value === "number" ? value : typeof value === "string" && value.trim() ? Number(value) : Number.NaN;
+  return Number.isInteger(decimals) && decimals >= 0 ? decimals : void 0;
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null;
+}
+function invalidTokenList(message) {
+  return new SwapSdkError("INVALID_API_RESPONSE", "tokens", message);
+}
+
 // src/mca/collateral.ts
 function resolveMcaWithdrawPolicy(input) {
   const decreaseCollateral = resolveMcaRequiredCollateralDecrease({
@@ -1399,7 +1572,7 @@ function normalizeMcaQuote(request, signer, quote) {
     mca: Object.freeze({ ...mca })
   };
   if (request.flow === "deposit") {
-    if (readString(quote.raw.nearDepositTxError)) {
+    if (readString2(quote.raw.nearDepositTxError)) {
       throw invalidResponse(String(quote.raw.nearDepositTxError));
     }
     return {
@@ -1410,7 +1583,7 @@ function normalizeMcaQuote(request, signer, quote) {
       ...quote.raw.nearDepositTx === void 0 ? {} : { nearDepositTx: quote.raw.nearDepositTx }
     };
   }
-  if (readString(quote.raw.nearMcaWithdrawTxError)) {
+  if (readString2(quote.raw.nearMcaWithdrawTxError)) {
     throw invalidResponse(String(quote.raw.nearMcaWithdrawTxError));
   }
   const mode = resolveWithdrawMode(request);
@@ -1438,7 +1611,7 @@ function resolveWithdrawMode(request) {
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function readString(value) {
+function readString2(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function invalidRequest(message) {
@@ -1740,7 +1913,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;
@@ -1762,7 +1934,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",
@@ -1783,7 +1954,6 @@ var McaSwapService = class {
     };
   }
   async swap(input) {
-    this.assertQuoteFresh(input.quote);
     if (input.quote.executionMode === "withdraw-relayer") {
       return this.executeRelayerWithdraw({ ...input, quote: input.quote });
     }
@@ -1926,7 +2096,7 @@ var McaSwapService = class {
           "MCA relayer preview is missing business"
         );
       }
-      const message = readString2(input.quote.preview.messageToSign);
+      const message = readString3(input.quote.preview.messageToSign);
       if (!message) {
         throw new SwapSdkError(
           "INVALID_API_RESPONSE",
@@ -1935,7 +2105,7 @@ var McaSwapService = class {
         );
       }
       const depositAddress = extractMcaWithdrawDepositAddress({
-        snapshotDepositAddress: readString2(input.quote.raw.depositAddress),
+        snapshotDepositAddress: readString3(input.quote.raw.depositAddress),
         preview: input.quote.preview,
         bestQuote: input.quote.raw.bestQuote
       });
@@ -2000,8 +2170,8 @@ var McaSwapService = class {
         signal: input.signal,
         idempotencyKey: input.idempotencyKey
       });
-      const orderId = readString2(raw.orderId) ?? readRecordString2(raw.deposit, "orderId");
-      const router = readString2(raw.router) ?? input.quote.route.router;
+      const orderId = readString3(raw.orderId) ?? readRecordString2(raw.deposit, "orderId");
+      const router = readString3(raw.router) ?? input.quote.route.router;
       const submittedDepositAddress = readRecordString2(raw.deposit, "depositAddress") ?? depositAddress;
       if (!orderId || !router) {
         throw new SwapSdkError(
@@ -2099,18 +2269,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;
@@ -2134,14 +2292,14 @@ function assertSignerMatchesQuote(signer, expected) {
     );
   }
 }
-function readString2(value) {
+function readString3(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function readRecordString2(value, field) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     return void 0;
   }
-  return readString2(value[field]);
+  return readString3(value[field]);
 }
 
 // src/client/SwapClient.ts
@@ -2149,6 +2307,8 @@ var SwapClient = class {
   constructor(config) {
     this.inFlight = /* @__PURE__ */ new Set();
     this.reportRequests = /* @__PURE__ */ new Map();
+    this.tokenListCache = /* @__PURE__ */ new Map();
+    this.tokenListInflight = /* @__PURE__ */ new Map();
     this.config = config;
     this.api = new ApiClient(config);
     this.registry = new ExecutorRegistry(config.executors ?? []);
@@ -2156,7 +2316,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),
@@ -2181,6 +2340,55 @@ var SwapClient = class {
   buildRaw(request, options = {}) {
     return this.api.build(request, options);
   }
+  async getFromTokens(request, options = {}) {
+    return this.loadTokenList("from", request, options, async () => {
+      const raw = await this.api.getFromTokenRows(request.chainId, options);
+      return normalizeFromTokenList(raw, request.chainId);
+    });
+  }
+  async getCrossChainToTokens(request, options = {}) {
+    return this.loadTokenList("cross-chain-to", request, options, async () => {
+      const raw = await this.api.getCrossChainToTokenRows(
+        request.chainId,
+        options
+      );
+      return normalizeCrossChainToTokenList(raw, request.chainId);
+    });
+  }
+  async loadTokenList(direction, request, options, load) {
+    if (!Number.isSafeInteger(request.chainId) || request.chainId <= 0) {
+      throw new SwapSdkError(
+        "INVALID_REQUEST",
+        "tokens",
+        `Token-list chainId must be a positive safe integer: ${String(
+          request.chainId
+        )}`
+      );
+    }
+    const ttlMs = Math.max(0, this.config.tokenListCacheTtlMs ?? 6e5);
+    const key = `${direction}:${request.chainId}`;
+    const cached = this.tokenListCache.get(key);
+    if (ttlMs > 0 && cached && cached.expiresAt > this.now()) {
+      return cloneTokenList(cached.tokens);
+    }
+    const existing = options.signal ? void 0 : this.tokenListInflight.get(key);
+    if (existing) return cloneTokenList(await existing);
+    const pending = load().then((tokens) => {
+      if (ttlMs > 0) {
+        this.tokenListCache.set(key, {
+          expiresAt: this.now() + ttlMs,
+          tokens: cloneTokenList(tokens)
+        });
+      }
+      return tokens;
+    }).finally(() => {
+      if (this.tokenListInflight.get(key) === pending) {
+        this.tokenListInflight.delete(key);
+      }
+    });
+    if (!options.signal) this.tokenListInflight.set(key, pending);
+    return cloneTokenList(await pending);
+  }
   async buildSwap(input) {
     if (isMcaQuote(input.quote)) {
       return this.managedSwapFlow.build({
@@ -2192,7 +2400,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;
@@ -2311,7 +2518,23 @@ var SwapClient = class {
           emit({ type: "warning", executionId: build.executionId, warning });
         }
       }
-      if ((input.waitFor ?? "submitted") === "completed" && orderId) {
+      const waitsForCompletion = (input.waitFor ?? "submitted") === "completed";
+      const requiresOrderStatus = build.isCrossChain || build.request?.confidentiality === "basic";
+      if (waitsForCompletion && requiresOrderStatus && !orderId) {
+        throw new SwapSdkError(
+          "INVALID_API_RESPONSE",
+          "status",
+          "Swap submitted, but the API did not provide a status key",
+          {
+            details: {
+              executionId: build.executionId,
+              ...result.txHash ? { txHash: result.txHash } : {},
+              router: orderRouter ?? build.router
+            }
+          }
+        );
+      }
+      if (waitsForCompletion && orderId) {
         const status = await this.waitForOrder({
           orderId,
           router: orderRouter ?? build.router,
@@ -2464,19 +2687,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;
@@ -2546,6 +2756,13 @@ function isMcaQuote(quote) {
 function readNonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
+function cloneTokenList(tokens) {
+  return tokens.map((token) => ({
+    ...token,
+    sources: [...token.sources],
+    raw: { ...token.raw }
+  }));
+}
 function delay(ms, signal) {
   return new Promise((resolve, reject) => {
     if (signal?.aborted) {
@@ -2594,6 +2811,8 @@ exports.formatUnits = formatUnits;
 exports.fromApiChain = fromApiChain;
 exports.isSameMcaSignerIdentity = isSameMcaSignerIdentity;
 exports.normalizeBuild = normalizeBuild;
+exports.normalizeCrossChainToTokenList = normalizeCrossChainToTokenList;
+exports.normalizeFromTokenList = normalizeFromTokenList;
 exports.normalizeHistory = normalizeHistory;
 exports.normalizeHistoryStatus = normalizeHistoryStatus;
 exports.normalizeMcaQuote = normalizeMcaQuote;