@rhea-finance/cross-chain-aggregation-dex 2.1.8 → 2.1.9

package/dist/index.mjs

@@ -920,6 +920,10 @@ function normalizeTronExecution(raw, chain) {
 }
 function isTronRawDataTx(value) {
   if (typeof value !== "object" || value === null) return false;
+  const kind = Reflect.get(value, "kind");
+  if (typeof kind === "string" && kind.toLowerCase() === "tron_contract") {
+    return true;
+  }
   const format = Reflect.get(value, "format");
   if (typeof format === "string" && format.toLowerCase() === "tron-raw-data") {
     return true;
@@ -1136,6 +1140,7 @@ function serializeQuoteRequest(request) {
     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.excludeDexs !== void 0 ? { excludeDexs: [...request.excludeDexs] } : {},
     ...request.confidentiality ? { confidentiality: request.confidentiality } : {},
     sender: request.sender.trim(),
     ...request.recipient?.trim() ? { recipient: request.recipient.trim() } : {}
@@ -2592,18 +2597,63 @@ var SwapClient = class {
       if (input.onEvent !== this.config.onEvent) input.onEvent?.(event);
     };
     try {
+      let activeBuild = build;
       const executor = this.registry.get(build.execution.kind);
+      if (build.execution.kind === "tron-transaction" && build.execution.approval && !build.request) {
+        throw new SwapSdkError(
+          "INVALID_REQUEST",
+          "sign",
+          "Tron approval builds require the original build request to rebuild after approval"
+        );
+      }
+      const needsTronRebuild = build.execution.kind === "tron-transaction" && Boolean(build.execution.approval) && Boolean(build.request);
       const context = {
         executionId: build.executionId,
         signal: input.signal,
         waitFor: input.waitFor ?? "submitted",
         emit,
-        ...input.beforeSign ? { beforeSign: input.beforeSign } : {}
+        ...input.beforeSign ? { beforeSign: input.beforeSign } : {},
+        ...needsTronRebuild ? {
+          refreshTronExecution: async () => {
+            const request = build.request;
+            if (!request) {
+              throw new SwapSdkError(
+                "INVALID_REQUEST",
+                "build",
+                "Missing build request to rebuild Tron swap after approval"
+              );
+            }
+            const raw = await this.api.build(request, {
+              signal: input.signal
+            });
+            const refreshed = normalizeBuild(
+              raw,
+              build.executionId,
+              request
+            );
+            if (refreshed.execution.kind !== "tron-transaction") {
+              throw new SwapSdkError(
+                "INVALID_API_RESPONSE",
+                "build",
+                "Rebuilt Tron swap must return a tron-transaction execution"
+              );
+            }
+            if (refreshed.execution.approval) {
+              throw new SwapSdkError(
+                "INVALID_API_RESPONSE",
+                "build",
+                "Tron approval is still required after rebuild"
+              );
+            }
+            activeBuild = refreshed;
+            return refreshed.execution;
+          }
+        } : {}
       };
       await executor.validate(build.execution, context);
       emit({ type: "signing-requested", executionId: build.executionId });
       const chainResult = await executor.execute(build.execution, context);
-      let orderId = chainResult.orderId ?? build.order?.orderId;
+      let orderId = chainResult.orderId ?? activeBuild.order?.orderId;
       if (chainResult.signature) {
         if (build.execution.kind !== "evm-signature") {
           throw new SwapSdkError(
@@ -2628,33 +2678,33 @@ var SwapClient = class {
         orderId = submitted.orderId;
       }
       const result = {
-        executionId: build.executionId,
+        executionId: activeBuild.executionId,
         status: chainResult.status,
-        router: build.router,
+        router: activeBuild.router,
         ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
         ...chainResult.txHashes ? { txHashes: chainResult.txHashes } : {},
         ...orderId ? { orderId } : {},
-        ...build.deposit?.depositAddress ? { depositAddress: build.deposit.depositAddress } : {},
+        ...activeBuild.deposit?.depositAddress ? { depositAddress: activeBuild.deposit.depositAddress } : {},
         report: { status: "skipped" },
-        raw: chainResult.raw ?? build.raw
+        raw: chainResult.raw ?? activeBuild.raw
       };
       emit({
         type: "submitted",
-        executionId: build.executionId,
+        executionId: activeBuild.executionId,
         ...chainResult.txHash ? { txHash: chainResult.txHash } : {},
         ...orderId ? { orderId } : {}
       });
       if (chainResult.status === "source-confirmed") {
         emit({
           type: "source-confirmed",
-          executionId: build.executionId
+          executionId: activeBuild.executionId
         });
       }
       const waitMode = input.waitFor ?? "submitted";
-      const requiresTrackedStatus = build.isCrossChain || build.request?.confidentiality === "basic";
-      const reportRequest = this.createReportRequest(build, result);
+      const requiresTrackedStatus = activeBuild.isCrossChain || activeBuild.request?.confidentiality === "basic";
+      const reportRequest = this.createReportRequest(activeBuild, result);
       if (reportRequest) {
-        this.reportRequests.set(build.executionId, reportRequest);
+        this.reportRequests.set(activeBuild.executionId, reportRequest);
       }
       const mustReportForStatus = requiresTrackedStatus && waitMode !== "submitted" && Boolean(reportRequest);
       const shouldReportNow = Boolean(reportRequest) && this.reportMode !== "disabled" && (this.reportMode === "auto" || mustReportForStatus);
@@ -2677,18 +2727,22 @@ var SwapClient = class {
             cause: error
           };
           result.report = { status: "failed", warning };
-          emit({ type: "warning", executionId: build.executionId, warning });
+          emit({
+            type: "warning",
+            executionId: activeBuild.executionId,
+            warning
+          });
         }
       }
       const shouldPollOrderStatus = shouldPollSwapOrderStatus({
         waitFor: waitMode,
-        isCrossChain: build.isCrossChain,
-        confidentiality: build.request?.confidentiality,
+        isCrossChain: activeBuild.isCrossChain,
+        confidentiality: activeBuild.request?.confidentiality,
         reportRecordId
       });
       const statusLookup = resolveOrderStatusLookup({
         recordId: reportRecordId ?? result.report?.recordId,
-        router: build.order?.router ?? build.router
+        router: activeBuild.order?.router ?? activeBuild.router
       });
       if (shouldPollOrderStatus && !statusLookup) {
         throw new SwapSdkError(
@@ -2697,8 +2751,8 @@ var SwapClient = class {
           "Swap submitted, but the report response did not include an id to query",
           {
             details: {
-              executionId: build.executionId,
-              router: build.router
+              executionId: activeBuild.executionId,
+              router: activeBuild.router
             }
           }
         );