@rhea-finance/confidential-swap 0.2.7 → 0.2.9

package/dist/index.cjs

@@ -604,6 +604,18 @@ function record(value) {
   responseAssert(value && typeof value === "object" && !Array.isArray(value), "Expected an object response.");
   return value;
 }
+function httpErrorMessage(data, status, content) {
+  if (data && typeof data === "object" && !Array.isArray(data)) {
+    const body = data;
+    const apiMessage = [body.message, body.error, body.msg].find(
+      (value) => typeof value === "string" && value.trim()
+    );
+    if (typeof apiMessage === "string") return apiMessage.trim();
+  }
+  const trimmed = content.trim();
+  if (trimmed && !trimmed.startsWith("<") && trimmed.length <= 300) return trimmed;
+  return `Service request failed (${status}).`;
+}
 var HttpConfidentialApi = class {
   constructor(config) {
     this.config = config;
@@ -652,7 +664,13 @@ var HttpConfidentialApi = class {
       } catch {
         throw new ConfidentialSwapError("INVALID_RESPONSE", "Service returned invalid JSON.", response.status);
       }
-      if (!response.ok) throw new ConfidentialSwapError(response.status === 401 || response.status === 403 ? "UNAUTHORIZED" : "HTTP_ERROR", `Service request failed (${response.status}).`, response.status);
+      if (!response.ok) {
+        throw new ConfidentialSwapError(
+          response.status === 401 || response.status === 403 ? "UNAUTHORIZED" : "HTTP_ERROR",
+          httpErrorMessage(data, response.status, content),
+          response.status
+        );
+      }
       return data;
     } catch (error) {
       throwIfAborted(signal);
@@ -969,6 +987,13 @@ var SessionManager = class {
 };
 
 // src/quote.ts
+var MAX_FLEX_FUNDING_REQUOTES = 3;
+function assertFundingQuoteWithinSlippage(baselineMinOut, nextAmountOut) {
+  assert(
+    nextAmountOut >= baselineMinOut,
+    "Funding quote moved beyond max slippage."
+  );
+}
 function aggregateWithdrawalAppFee(quotes, assetId) {
   if (quotes.length === 0 || quotes.some((quote) => !quote.quoteRequest?.amount || !Array.isArray(quote.quoteRequest.appFees))) return void 0;
   let totalInput = 0n;
@@ -1030,23 +1055,42 @@ async function quoteDepositAndWithdrawals(params) {
         slippageBps: req.slippageBps
       };
       const initialSwapQuote = await deps.swap.quote(clone(swapRequest), signal);
-      raw(initialSwapQuote.amountOut);
-      assert(raw(initialSwapQuote.minAmountOut) <= raw(initialSwapQuote.amountOut), "Invalid funding swap minimum output.");
-      depositQuote = await deps.api.quote({
-        ...base,
-        amount: initialSwapQuote.amountOut,
-        refundTo: signerId,
-        refundType: "CONFIDENTIAL_INTENTS",
-        depositType: "ORIGIN_CHAIN",
-        swapType: "FLEX_INPUT",
-        dry: false
-      }, signal);
-      validateQuote(depositQuote, true);
-      swapRequest = { ...swapRequest, recipient: depositQuote.quote.depositAddress };
-      swapQuote = await deps.swap.quote(clone(swapRequest), signal);
-      raw(swapQuote.amountOut);
-      assert(raw(swapQuote.minAmountOut) <= raw(swapQuote.amountOut), "Invalid funding swap minimum output.");
-      fundingAmount = swapQuote.amountOut;
+      const baselineOut = raw(initialSwapQuote.amountOut);
+      const baselineMinOut = raw(initialSwapQuote.minAmountOut);
+      assert(baselineMinOut <= baselineOut, "Invalid funding swap minimum output.");
+      let latestDepositAmountIn = initialSwapQuote.amountOut;
+      let covered = false;
+      for (let attempt = 0; attempt < MAX_FLEX_FUNDING_REQUOTES; attempt++) {
+        depositQuote = await deps.api.quote({
+          ...base,
+          // Always the most recent funding-swap amountOut — never stick on pass 1
+          // after a requote.
+          amount: latestDepositAmountIn,
+          refundTo: signerId,
+          refundType: "CONFIDENTIAL_INTENTS",
+          depositType: "ORIGIN_CHAIN",
+          swapType: "FLEX_INPUT",
+          dry: false
+        }, signal);
+        validateQuote(depositQuote, true);
+        swapRequest = { ...swapRequest, recipient: depositQuote.quote.depositAddress };
+        swapQuote = await deps.swap.quote(clone(swapRequest), signal);
+        const nextOut = raw(swapQuote.amountOut);
+        const nextMinOut = raw(swapQuote.minAmountOut);
+        assert(nextMinOut <= nextOut, "Invalid funding swap minimum output.");
+        assertFundingQuoteWithinSlippage(baselineMinOut, nextOut);
+        const flexMinIn = depositQuote.quote.minAmountIn !== void 0 ? raw(depositQuote.quote.minAmountIn) : void 0;
+        if (flexMinIn === void 0 || nextMinOut >= flexMinIn) {
+          fundingAmount = swapQuote.amountOut;
+          covered = true;
+          break;
+        }
+        latestDepositAmountIn = swapQuote.amountOut;
+      }
+      assert(
+        covered && swapQuote,
+        "Final funding quote does not cover FLEX minimum input."
+      );
     }
   }
   const shares = splitConfidentialRawAmount(fundingAmount, req.recipients.length, randomValues);