@rhea-finance/confidential-swap 0.2.9 → 0.3.1

package/dist/index.cjs

@@ -987,13 +987,26 @@ 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 swapQuoteRecipient(quote) {
+  const data = quote.data;
+  return String(data?.request?.recipient || "").trim();
+}
+function depositQuoteForAddress(address, amount) {
+  return {
+    quote: {
+      amountIn: amount,
+      amountOut: amount,
+      minAmountOut: amount,
+      depositAddress: address
+    }
+  };
+}
 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;
@@ -1058,39 +1071,37 @@ async function quoteDepositAndWithdrawals(params) {
       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({
+      const knownRecipient = swapQuoteRecipient(initialSwapQuote);
+      if (knownRecipient) {
+        swapRequest = { ...swapRequest, recipient: knownRecipient };
+        swapQuote = await deps.swap.quote(clone(swapRequest), signal);
+        const latestOut = raw(swapQuote.amountOut);
+        assert(raw(swapQuote.minAmountOut) <= latestOut, "Invalid funding swap minimum output.");
+        assertFundingQuoteWithinSlippage(baselineMinOut, latestOut);
+        fundingAmount = swapQuote.amountOut;
+        depositQuote = depositQuoteForAddress(knownRecipient, swapQuote.amountOut);
+      } else {
+        const seededDeposit = await deps.api.quote({
           ...base,
-          // Always the most recent funding-swap amountOut — never stick on pass 1
-          // after a requote.
-          amount: latestDepositAmountIn,
+          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 };
+        validateQuote(seededDeposit, true);
+        swapRequest = { ...swapRequest, recipient: seededDeposit.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;
+        const latestOut = raw(swapQuote.amountOut);
+        assert(raw(swapQuote.minAmountOut) <= latestOut, "Invalid funding swap minimum output.");
+        assertFundingQuoteWithinSlippage(baselineMinOut, latestOut);
+        fundingAmount = swapQuote.amountOut;
+        depositQuote = {
+          ...seededDeposit,
+          quote: { ...seededDeposit.quote, amountIn: swapQuote.amountOut }
+        };
       }
-      assert(
-        covered && swapQuote,
-        "Final funding quote does not cover FLEX minimum input."
-      );
     }
   }
   const shares = splitConfidentialRawAmount(fundingAmount, req.recipients.length, randomValues);