@rhea-finance/confidential-swap 0.3.0 → 0.3.1

package/dist/index.cjs

@@ -993,6 +993,20 @@ function assertFundingQuoteWithinSlippage(baselineMinOut, nextAmountOut) {
     "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;
@@ -1057,43 +1071,37 @@ async function quoteDepositAndWithdrawals(params) {
       const baselineOut = raw(initialSwapQuote.amountOut);
       const baselineMinOut = raw(initialSwapQuote.minAmountOut);
       assert(baselineMinOut <= baselineOut, "Invalid funding swap minimum output.");
-      const seededDeposit = await deps.api.quote({
-        ...base,
-        amount: initialSwapQuote.amountOut,
-        refundTo: signerId,
-        refundType: "CONFIDENTIAL_INTENTS",
-        depositType: "ORIGIN_CHAIN",
-        swapType: "FLEX_INPUT",
-        dry: false
-      }, signal);
-      validateQuote(seededDeposit, true);
-      swapRequest = { ...swapRequest, recipient: seededDeposit.quote.depositAddress };
-      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);
-      if (latestOut === baselineOut) {
-        depositQuote = seededDeposit;
+      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 {
-        depositQuote = await deps.api.quote({
+        const seededDeposit = await deps.api.quote({
           ...base,
-          amount: swapQuote.amountOut,
+          amount: initialSwapQuote.amountOut,
           refundTo: signerId,
           refundType: "CONFIDENTIAL_INTENTS",
           depositType: "ORIGIN_CHAIN",
           swapType: "FLEX_INPUT",
           dry: false
         }, signal);
-        validateQuote(depositQuote, true);
-        if (depositQuote.quote.depositAddress !== seededDeposit.quote.depositAddress) {
-          swapRequest = { ...swapRequest, recipient: depositQuote.quote.depositAddress };
-          swapQuote = await deps.swap.quote(clone(swapRequest), signal);
-          const boundOut = raw(swapQuote.amountOut);
-          assert(raw(swapQuote.minAmountOut) <= boundOut, "Invalid funding swap minimum output.");
-          assertFundingQuoteWithinSlippage(baselineMinOut, boundOut);
-        }
+        validateQuote(seededDeposit, true);
+        swapRequest = { ...swapRequest, recipient: seededDeposit.quote.depositAddress };
+        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 = {
+          ...seededDeposit,
+          quote: { ...seededDeposit.quote, amountIn: swapQuote.amountOut }
+        };
       }
-      fundingAmount = swapQuote.amountOut;
     }
   }
   const shares = splitConfidentialRawAmount(fundingAmount, req.recipients.length, randomValues);