@rhea-finance/cross-chain-aggregation-dex 2.0.1 → 2.0.3

package/dist/index.mjs

@@ -301,7 +301,11 @@ var ApiClient = class {
     }
   }
   isEnvelope(value) {
-    return typeof value === "object" && value !== null && "code" in value && typeof value.code === "number" && "msg" in value && typeof value.msg === "string" && "data" in value;
+    if (typeof value !== "object" || value === null) return false;
+    if (!("code" in value) || typeof value.code !== "number") return false;
+    if (!("msg" in value) || typeof value.msg !== "string") return false;
+    if (value.code === 0 && !("data" in value)) return false;
+    return true;
   }
   readMessage(value) {
     if (typeof value !== "object" || value === null || !("msg" in value)) {
@@ -510,16 +514,37 @@ function unsupportedChain(chain) {
 var decimalStringSchema = z.string().regex(/^(0|[1-9]\d*)$/);
 var nonEmptyStringSchema = z.string().trim().min(1);
 var hexDataSchema = z.string().regex(/^0x(?:[0-9a-fA-F]{2})*$/);
-var positiveIntegerSchema = z.number().int().positive();
+z.number().int().positive();
+var evmChainIdSchema = z.preprocess((value) => {
+  if (typeof value !== "string") return value;
+  const normalized = value.trim();
+  if (!/^(?:[1-9]\d*|0x[0-9a-fA-F]+)$/.test(normalized)) {
+    return value;
+  }
+  try {
+    const parsed = BigInt(normalized);
+    return parsed <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(parsed) : value;
+  } catch {
+    return value;
+  }
+}, z.number().int().positive().max(Number.MAX_SAFE_INTEGER));
 var evmQuantitySchema = z.string().regex(/^(?:0|[1-9]\d*|0x[0-9a-fA-F]+)$/).transform(
   (value) => value.startsWith("0x") ? BigInt(value).toString() : value
 );
+var optionalEvmQuantitySchema = z.preprocess(
+  (value) => value === null || value === void 0 || value === "" ? void 0 : value,
+  evmQuantitySchema.optional()
+);
 var evmTxSchema = z.object({
   to: nonEmptyStringSchema,
   data: hexDataSchema,
   value: evmQuantitySchema,
-  gasLimit: evmQuantitySchema,
-  chainId: positiveIntegerSchema
+  gasLimit: optionalEvmQuantitySchema,
+  gasPrice: optionalEvmQuantitySchema,
+  maxFeePerGas: optionalEvmQuantitySchema,
+  maxPriorityFeePerGas: optionalEvmQuantitySchema,
+  from: nonEmptyStringSchema.optional(),
+  chainId: evmChainIdSchema
 });
 
 // src/normalizers/build.ts
@@ -544,7 +569,7 @@ var signingRequestSchema = z.object({
   type: nonEmptyStringSchema,
   router: nonEmptyStringSchema,
   quoteId: nonEmptyStringSchema,
-  chainId: positiveIntegerSchema,
+  chainId: evmChainIdSchema,
   signingScheme: z.string().optional(),
   typedData: z.object({
     domain: z.record(z.string(), z.unknown()),
@@ -750,11 +775,20 @@ function normalizeEvmApproval(raw, chain) {
     assertEvmChainId(chain, approveTx.chainId);
     return {
       tx: approveTx,
-      spender: nonEmptyStringSchema.parse(raw.approve.spender)
+      spender: readErc20ApproveSpender(approveTx.data) ?? nonEmptyStringSchema.parse(raw.approve.spender)
     };
   }
   return void 0;
 }
+function readErc20ApproveSpender(data) {
+  const normalized = data.toLowerCase();
+  if (!normalized.startsWith("0x095ea7b3") || normalized.length < 10 + 64) {
+    return void 0;
+  }
+  const addressWord = normalized.slice(10, 10 + 64);
+  if (!/^[0-9a-f]{64}$/.test(addressWord)) return void 0;
+  return `0x${addressWord.slice(24)}`;
+}
 function laneFromChainType(chainType, fromChain) {
   const normalized = chainType.toLowerCase();
   const aliases = {
@@ -770,7 +804,9 @@ function laneFromChainType(chainType, fromChain) {
     zec: "zcash",
     sui: "sui"
   };
-  if (normalized === "cross-chain") return laneFromChain(fromChain);
+  if (normalized === "cross-chain" || normalized === "utxo") {
+    return laneFromChain(fromChain);
+  }
   const lane = aliases[normalized];
   if (!lane) {
     throw new SwapSdkError(
@@ -1637,6 +1673,7 @@ var McaSwapService = class {
     const result = await this.client.executeSwap({
       build,
       waitFor: input.quote.executionMode === "withdraw-near" && input.waitFor === "completed" ? "source-confirmed" : input.waitFor,
+      orderPolling: input.orderPolling,
       signal: input.signal,
       onEvent: input.onEvent
     });
@@ -1644,6 +1681,7 @@ var McaSwapService = class {
       const status = await this.client.waitForOrder({
         orderId: nearStatusKey,
         router: input.quote.route.router,
+        ...input.orderPolling,
         signal: input.signal
       });
       this.emitEvent(
@@ -1885,6 +1923,7 @@ var McaSwapService = class {
         const status = await this.client.waitForOrder({
           orderId,
           router,
+          ...input.orderPolling,
           signal: input.signal
         });
         emit({ type: "order-status", executionId, status: status.status });
@@ -2108,24 +2147,17 @@ var SwapClient = class {
         report: { status: "skipped" },
         raw: chainResult.raw ?? build.raw
       };
-      if (chainResult.status === "requires-user-action") {
+      emit({
+        type: "submitted",
+        executionId: build.executionId,
+        ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
+        ...orderId ? { orderId } : {}
+      });
+      if (chainResult.status === "source-confirmed") {
         emit({
-          type: "requires-user-action",
+          type: "source-confirmed",
           executionId: build.executionId
         });
-      } else {
-        emit({
-          type: "submitted",
-          executionId: build.executionId,
-          ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
-          ...orderId ? { orderId } : {}
-        });
-        if (chainResult.status === "source-confirmed") {
-          emit({
-            type: "source-confirmed",
-            executionId: build.executionId
-          });
-        }
       }
       const reportRequest = this.createReportRequest(build, result);
       if (reportRequest) {
@@ -2150,6 +2182,7 @@ var SwapClient = class {
           orderId,
           router: orderRouter ?? build.router,
           chainId: orderChainId,
+          ...input.orderPolling,
           signal: input.signal
         });
         result.status = status.status === "unknown" || status.status === "pending" ? "processing" : status.status;
@@ -2179,6 +2212,7 @@ var SwapClient = class {
     return this.executeSwap({
       build,
       waitFor: regularInput.waitFor,
+      orderPolling: regularInput.orderPolling,
       signal: regularInput.signal,
       onEvent: regularInput.onEvent,
       beforeSign: regularInput.beforeSign
@@ -2202,8 +2236,8 @@ var SwapClient = class {
   }
   async waitForOrder(input) {
     const intervalMs = input.intervalMs ?? 5e3;
-    const timeoutMs = input.timeoutMs ?? 25e4;
-    const startedAt = this.now();
+    const timeoutMs = input.timeoutMs;
+    const startedAt = timeoutMs === void 0 ? void 0 : this.now();
     for (; ; ) {
       if (input.signal?.aborted) {
         throw new SwapSdkError(
@@ -2216,7 +2250,7 @@ var SwapClient = class {
       if (result.status === "completed" || result.status === "failed" || result.status === "refunded" || result.status === "expired") {
         return result;
       }
-      if (this.now() - startedAt >= timeoutMs) {
+      if (timeoutMs !== void 0 && startedAt !== void 0 && this.now() - startedAt >= timeoutMs) {
         throw new SwapSdkError(
           "ORDER_TIMEOUT",
           "status",