@buildonspark/spark-sdk 0.1.43 → 0.1.44

package/dist/{chunk-WWOTVNPP.js → chunk-A2ZLMH6I.js}

@@ -1,12 +1,12 @@
 import {
   ConnectionManager
-} from "./chunk-HRQRRDSS.js";
+} from "./chunk-WPTRVD2V.js";
 import {
   Lrc20ConnectionManager
-} from "./chunk-GYQR4B4P.js";
+} from "./chunk-NBCNYDWJ.js";
 import {
   TokenTransactionService
-} from "./chunk-DQYKQJRZ.js";
+} from "./chunk-CIZNCBKE.js";
 import {
   DEFAULT_FEE_SATS,
   computeTaprootKeyNoScript,
@@ -23,16 +23,17 @@ import {
   getTxFromRawTxHex,
   getTxId,
   proofOfPossessionMessageHashForDepositAddress
-} from "./chunk-IRW5TWMH.js";
+} from "./chunk-XX4RRWOX.js";
 import {
   calculateAvailableTokenAmount
 } from "./chunk-6AFUC5M2.js";
 import {
   mapTransferToWalletTransfer,
   mapTreeNodeToWalletLeaf
-} from "./chunk-MIVX3GHD.js";
+} from "./chunk-K4BJARWM.js";
 import {
   ClaimStaticDepositRequestType_default,
+  CoopExitFeeQuoteFromJson,
   CurrencyAmountFromJson,
   ExitSpeed_default,
   FRAGMENT,
@@ -40,20 +41,21 @@ import {
   FRAGMENT3,
   FRAGMENT4,
   FRAGMENT5,
+  FRAGMENT6,
   LeavesSwapRequestFromJson,
   LightningReceiveRequestFromJson,
   LightningSendRequestFromJson,
   SparkCoopExitRequestStatus_default,
   TransferFromJson
-} from "./chunk-TOSP3INR.js";
+} from "./chunk-I54FARY2.js";
 import {
   decodeSparkAddress,
   encodeSparkAddress,
   isValidPublicKey
-} from "./chunk-O4RYNJNB.js";
+} from "./chunk-KEKGSH7B.js";
 import {
   WalletConfigService
-} from "./chunk-BUTZWYBW.js";
+} from "./chunk-DAXGVPVM.js";
 import {
   LRC_WALLET_NETWORK,
   LRC_WALLET_NETWORK_TYPE,
@@ -63,17 +65,17 @@ import {
 } from "./chunk-Z5HIAYFT.js";
 import {
   ELECTRS_CREDENTIALS
-} from "./chunk-DOA6QXYQ.js";
+} from "./chunk-EKFD62HN.js";
 import {
   BitcoinNetwork_default
 } from "./chunk-HMLOC6TE.js";
 import {
   SendLeafKeyTweaks,
   networkToJSON
-} from "./chunk-M6A4KFIG.js";
+} from "./chunk-4Q2ZDYYU.js";
 import {
   isReactNative
-} from "./chunk-VFJQNBFX.js";
+} from "./chunk-UBT6EDVJ.js";
 import {
   addPublicKeys,
   applyAdaptorToSignature,
@@ -126,7 +128,7 @@ var ClaimStaticDepositOutputFromJson = (obj) => {
     transferId: obj["claim_static_deposit_output_transfer_id"]
   };
 };
-var FRAGMENT6 = `
+var FRAGMENT7 = `
 fragment ClaimStaticDepositOutputFragment on ClaimStaticDepositOutput {
     __typename
     claim_static_deposit_output_transfer_id: transfer_id
@@ -159,7 +161,7 @@ var ClaimStaticDeposit = `
     }
   }
     
-  ${FRAGMENT6}
+  ${FRAGMENT7}
 `;
 
 // src/graphql/objects/CoopExitRequest.ts
@@ -185,7 +187,7 @@ var CoopExitRequestFromJson = (obj) => {
     transfer: !!obj["coop_exit_request_transfer"] ? TransferFromJson(obj["coop_exit_request_transfer"]) : void 0
   };
 };
-var FRAGMENT7 = `
+var FRAGMENT8 = `
 fragment CoopExitRequestFragment on CoopExitRequest {
     __typename
     coop_exit_request_id: id
@@ -250,7 +252,7 @@ var CompleteCoopExit = `
     }
   }
     
-  ${FRAGMENT7}
+  ${FRAGMENT8}
 `;
 
 // src/graphql/mutations/CompleteLeavesSwap.ts
@@ -276,7 +278,7 @@ var GetChallengeOutputFromJson = (obj) => {
     protectedChallenge: obj["get_challenge_output_protected_challenge"]
   };
 };
-var FRAGMENT8 = `
+var FRAGMENT9 = `
 fragment GetChallengeOutputFragment on GetChallengeOutput {
     __typename
     get_challenge_output_protected_challenge: protected_challenge
@@ -294,7 +296,7 @@ var GetChallenge = `
     }
   }
     
-    ${FRAGMENT8}
+    ${FRAGMENT9}
 `;
 
 // src/graphql/mutations/RequestCoopExit.ts
@@ -304,6 +306,9 @@ var RequestCoopExit = `
     $withdrawal_address: String!
     $idempotency_key: String!
     $exit_speed: ExitSpeed!
+    $withdraw_all: Boolean
+    $fee_leaf_external_ids: [UUID!]
+    $fee_quote_id: ID
   ) {
     request_coop_exit(
       input: {
@@ -311,6 +316,9 @@ var RequestCoopExit = `
         withdrawal_address: $withdrawal_address
         idempotency_key: $idempotency_key
         exit_speed: $exit_speed
+        withdraw_all: $withdraw_all
+        fee_leaf_external_ids: $fee_leaf_external_ids
+        fee_quote_id: $fee_quote_id
       }
     ) {
       request {
@@ -318,7 +326,7 @@ var RequestCoopExit = `
       }
     }
   }
-  ${FRAGMENT7}
+  ${FRAGMENT8}
 `;
 
 // src/graphql/mutations/RequestLightningReceive.ts
@@ -382,6 +390,7 @@ var RequestSwapLeaves = `
     $fee_sats: Long!
     $user_leaves: [UserLeafInput!]!
     $idempotency_key: String!
+    $target_amount_sats_list: [Long!]
   ) {
     request_leaves_swap(input: {
       adaptor_pubkey: $adaptor_pubkey
@@ -390,6 +399,7 @@ var RequestSwapLeaves = `
       fee_sats: $fee_sats
       user_leaves: $user_leaves
       idempotency_key: $idempotency_key
+      target_amount_sats_list: $target_amount_sats_list
     }) {
       request {
         ...LeavesSwapRequestFragment
@@ -406,7 +416,7 @@ var VerifyChallengeOutputFromJson = (obj) => {
     sessionToken: obj["verify_challenge_output_session_token"]
   };
 };
-var FRAGMENT9 = `
+var FRAGMENT10 = `
 fragment VerifyChallengeOutputFragment on VerifyChallengeOutput {
     __typename
     verify_challenge_output_valid_until: valid_until
@@ -431,7 +441,7 @@ var VerifyChallenge = `
     }
   }
     
-    ${FRAGMENT9}
+    ${FRAGMENT10}
 `;
 
 // src/graphql/objects/CoopExitFeeEstimate.ts
@@ -450,7 +460,7 @@ var CoopExitFeeEstimatesOutputFromJson = (obj) => {
     speedSlow: !!obj["coop_exit_fee_estimates_output_speed_slow"] ? CoopExitFeeEstimateFromJson(obj["coop_exit_fee_estimates_output_speed_slow"]) : void 0
   };
 };
-var FRAGMENT10 = `
+var FRAGMENT11 = `
 fragment CoopExitFeeEstimatesOutputFragment on CoopExitFeeEstimatesOutput {
     __typename
     coop_exit_fee_estimates_output_speed_fast: speed_fast {
@@ -518,7 +528,7 @@ var LeavesSwapFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["leaves_swap_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT11 = `
+var FRAGMENT12 = `
 fragment LeavesSwapFeeEstimateOutputFragment on LeavesSwapFeeEstimateOutput {
     __typename
     leaves_swap_fee_estimate_output_fee_estimate: fee_estimate {
@@ -537,7 +547,7 @@ var LightningSendFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["lightning_send_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT12 = `
+var FRAGMENT13 = `
 fragment LightningSendFeeEstimateOutputFragment on LightningSendFeeEstimateOutput {
     __typename
     lightning_send_fee_estimate_output_fee_estimate: fee_estimate {
@@ -560,7 +570,7 @@ var StaticDepositQuoteOutputFromJson = (obj) => {
     signature: obj["static_deposit_quote_output_signature"]
   };
 };
-var FRAGMENT13 = `
+var FRAGMENT14 = `
 fragment StaticDepositQuoteOutputFragment on StaticDepositQuoteOutput {
     __typename
     static_deposit_quote_output_transaction_id: transaction_id
@@ -585,7 +595,7 @@ var CoopExitFeeEstimate2 = `
       ...CoopExitFeeEstimatesOutputFragment
     }
   }
-  ${FRAGMENT10}
+  ${FRAGMENT11}
 `;
 
 // src/graphql/queries/GetClaimDepositQuote.ts
@@ -605,7 +615,27 @@ var GetClaimDepositQuote = `
       ...StaticDepositQuoteOutputFragment
     }
   }
-  ${FRAGMENT13}
+  ${FRAGMENT14}
+`;
+
+// src/graphql/queries/GetCoopExitFeeQuote.ts
+var GetCoopExitFeeQuote = `
+  query CoopExitFeeQuote(
+    $leaf_external_ids: [UUID!]!
+    $withdrawal_address: String!
+  ) {
+    coop_exit_fee_quote(
+      input: {
+        leaf_external_ids: $leaf_external_ids,
+        withdrawal_address: $withdrawal_address
+      }
+    ) {
+      quote {
+        ...CoopExitFeeQuoteFragment
+      }
+    }
+  }
+  ${FRAGMENT5}
 `;
 
 // src/graphql/queries/LeavesSwapFeeEstimate.ts
@@ -621,7 +651,7 @@ var LeavesSwapFeeEstimate = `
       ...LeavesSwapFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT11}
+  ${FRAGMENT12}
 `;
 
 // src/graphql/queries/LightningSendFeeEstimate.ts
@@ -639,7 +669,7 @@ var LightningSendFeeEstimate = `
       ...LightningSendFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT12}
+  ${FRAGMENT13}
 `;
 
 // src/graphql/queries/Transfer.ts
@@ -659,7 +689,7 @@ var UserRequest = `
       ...UserRequestFragment
     }
   }
-  ${FRAGMENT5}
+  ${FRAGMENT6}
 `;
 
 // src/graphql/client.ts
@@ -781,7 +811,10 @@ var SspClient = class {
     leafExternalIds,
     withdrawalAddress,
     idempotencyKey,
-    exitSpeed
+    exitSpeed,
+    feeLeafExternalIds,
+    feeQuoteId,
+    withdrawAll
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestCoopExit,
@@ -789,7 +822,10 @@ var SspClient = class {
         leaf_external_ids: leafExternalIds,
         withdrawal_address: withdrawalAddress,
         idempotency_key: idempotencyKey,
-        exit_speed: exitSpeed
+        exit_speed: exitSpeed,
+        fee_leaf_external_ids: feeLeafExternalIds,
+        fee_quote_id: feeQuoteId,
+        withdraw_all: withdrawAll
       },
       constructObject: (response) => {
         return CoopExitRequestFromJson(response.request_coop_exit.request);
@@ -851,7 +887,8 @@ var SspClient = class {
     targetAmountSats,
     feeSats,
     userLeaves,
-    idempotencyKey
+    idempotencyKey,
+    targetAmountSatsList
   }) {
     const query = {
       queryPayload: RequestSwapLeaves,
@@ -861,7 +898,8 @@ var SspClient = class {
         target_amount_sats: targetAmountSats,
         fee_sats: feeSats,
         user_leaves: userLeaves,
-        idempotency_key: idempotencyKey
+        idempotency_key: idempotencyKey,
+        target_amount_sats_list: targetAmountSatsList
       },
       constructObject: (response) => {
         if (!response.request_leaves_swap) {
@@ -1053,6 +1091,21 @@ var SspClient = class {
       new Date(verifyChallenge.validUntil)
     );
   }
+  async getCoopExitFeeQuote({
+    leafExternalIds,
+    withdrawalAddress
+  }) {
+    return await this.executeRawQuery({
+      queryPayload: GetCoopExitFeeQuote,
+      variables: {
+        leaf_external_ids: leafExternalIds,
+        withdrawal_address: withdrawalAddress
+      },
+      constructObject: (response) => {
+        return CoopExitFeeQuoteFromJson(response.coop_exit_fee_quote.quote);
+      }
+    });
+  }
 };
 var SparkAuthProvider = class {
   sessionToken;
@@ -3250,7 +3303,7 @@ import { hexToBytes as hexToBytes4 } from "@noble/curves/abstract/utils";
 import { sha256 as sha2566 } from "@noble/hashes/sha2";
 import { Address as Address2, OutScript as OutScript2, Transaction as Transaction4 } from "@scure/btc-signer";
 var INITIAL_TIME_LOCK3 = 2e3;
-function maybeApplyFee2(amount) {
+function maybeApplyFee(amount) {
   if (amount > BigInt(DEFAULT_FEE_SATS)) {
     return amount - BigInt(DEFAULT_FEE_SATS);
   }
@@ -3519,7 +3572,7 @@ var TreeCreationService = class {
     const refundPkScript = OutScript2.encode(refundAddress);
     refundTx.addOutput({
       script: refundPkScript,
-      amount: maybeApplyFee2(parentTxOut.amount)
+      amount: maybeApplyFee(parentTxOut.amount)
     });
     refundTx.addOutput(getEphemeralAnchorOutput());
     const refundSigningNonceCommitment = await this.config.signer.getRandomSigningCommitment();
@@ -4387,13 +4440,34 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       ([_, node]) => node.status === "AVAILABLE" && !leavesToIgnore.has(node.id)
     ).map(([_, node]) => node);
   }
-  async selectLeaves(targetAmount) {
-    if (targetAmount <= 0) {
+  async selectLeaves(targetAmounts) {
+    if (targetAmounts.length === 0) {
+      throw new ValidationError("Target amounts must be non-empty", {
+        field: "targetAmounts",
+        value: targetAmounts
+      });
+    }
+    if (targetAmounts.some((amount) => amount <= 0)) {
       throw new ValidationError("Target amount must be positive", {
-        field: "targetAmount",
-        value: targetAmount
+        field: "targetAmounts",
+        value: targetAmounts
       });
     }
+    const totalTargetAmount = targetAmounts.reduce(
+      (acc, amount) => acc + amount,
+      0
+    );
+    const totalBalance = this.getInternalBalance();
+    if (totalTargetAmount > totalBalance) {
+      throw new ValidationError(
+        "Total target amount exceeds available balance",
+        {
+          field: "targetAmounts",
+          value: totalTargetAmount,
+          expected: `less than or equal to ${totalBalance}`
+        }
+      );
+    }
     const leaves = await this.getLeaves();
     if (leaves.length === 0) {
       throw new ValidationError("No owned leaves found", {
@@ -4401,33 +4475,49 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
     }
     leaves.sort((a, b) => b.value - a.value);
-    let amount = 0;
-    let nodes = [];
-    for (const leaf of leaves) {
-      if (targetAmount - amount >= leaf.value) {
-        amount += leaf.value;
-        nodes.push(leaf);
-      }
-    }
-    if (amount !== targetAmount) {
-      await this.requestLeavesSwap({ targetAmount });
-      amount = 0;
-      nodes = [];
-      const newLeaves = await this.getLeaves();
-      newLeaves.sort((a, b) => b.value - a.value);
-      for (const leaf of newLeaves) {
-        if (targetAmount - amount >= leaf.value) {
-          amount += leaf.value;
-          nodes.push(leaf);
+    const selectLeavesForTargets = (targetAmounts2, leaves2) => {
+      const usedLeaves = /* @__PURE__ */ new Set();
+      const results2 = /* @__PURE__ */ new Map();
+      let totalAmount = 0;
+      for (const targetAmount of targetAmounts2) {
+        const nodes = [];
+        let amount = 0;
+        for (const leaf of leaves2) {
+          if (usedLeaves.has(leaf.id)) {
+            continue;
+          }
+          if (targetAmount - amount >= leaf.value) {
+            amount += leaf.value;
+            nodes.push(leaf);
+            usedLeaves.add(leaf.id);
+          }
         }
+        totalAmount += amount;
+        results2.set(targetAmount, nodes);
       }
+      return {
+        results: results2,
+        foundSelections: totalAmount === totalTargetAmount
+      };
+    };
+    let { results, foundSelections } = selectLeavesForTargets(
+      targetAmounts,
+      leaves
+    );
+    if (!foundSelections) {
+      const newLeaves = await this.requestLeavesSwap({ targetAmounts });
+      newLeaves.sort((a, b) => b.value - a.value);
+      ({ results, foundSelections } = selectLeavesForTargets(
+        targetAmounts,
+        newLeaves
+      ));
     }
-    if (nodes.reduce((acc, leaf) => acc + leaf.value, 0) !== targetAmount) {
+    if (!foundSelections) {
       throw new Error(
-        `Failed to select leaves for target amount ${targetAmount}`
+        `Failed to select leaves for target amount ${totalTargetAmount}`
       );
     }
-    return nodes;
+    return results;
   }
   async selectLeavesForSwap(targetAmount) {
     if (targetAmount == 0) {
@@ -4660,27 +4750,44 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @private
    */
   async requestLeavesSwap({
-    targetAmount,
+    targetAmounts,
     leaves
   }) {
-    if (targetAmount && targetAmount <= 0) {
-      throw new Error("targetAmount must be positive");
+    if (targetAmounts && targetAmounts.some((amount) => amount <= 0)) {
+      throw new Error("specified targetAmount must be positive");
     }
-    if (targetAmount && !Number.isSafeInteger(targetAmount)) {
+    if (targetAmounts && targetAmounts.some((amount) => !Number.isSafeInteger(amount))) {
       throw new ValidationError("targetAmount must be less than 2^53", {
-        field: "targetAmount",
-        value: targetAmount,
+        field: "targetAmounts",
+        value: targetAmounts,
         expected: "smaller or equal to " + Number.MAX_SAFE_INTEGER
       });
     }
     let leavesToSwap;
-    if (targetAmount && leaves && leaves.length > 0) {
-      if (targetAmount < leaves.reduce((acc, leaf) => acc + leaf.value, 0)) {
+    const totalTargetAmount = targetAmounts?.reduce(
+      (acc, amount) => acc + amount,
+      0
+    );
+    if (totalTargetAmount) {
+      const totalBalance = this.getInternalBalance();
+      if (totalTargetAmount > totalBalance) {
+        throw new ValidationError(
+          "Total target amount exceeds available balance",
+          {
+            field: "targetAmounts",
+            value: totalTargetAmount,
+            expected: `less than or equal to ${totalBalance}`
+          }
+        );
+      }
+    }
+    if (totalTargetAmount && leaves && leaves.length > 0) {
+      if (totalTargetAmount < leaves.reduce((acc, leaf) => acc + leaf.value, 0)) {
         throw new Error("targetAmount is less than the sum of leaves");
       }
       leavesToSwap = leaves;
-    } else if (targetAmount) {
-      leavesToSwap = await this.selectLeavesForSwap(targetAmount);
+    } else if (totalTargetAmount) {
+      leavesToSwap = await this.selectLeavesForSwap(totalTargetAmount);
     } else if (leaves && leaves.length > 0) {
       leavesToSwap = leaves;
     } else {
@@ -4690,15 +4797,15 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const batches = chunkArray(leavesToSwap, 100);
     const results = [];
     for (const batch of batches) {
-      const result = await this.processSwapBatch(batch, targetAmount);
-      results.push(...result.swapLeaves);
+      const result = await this.processSwapBatch(batch, targetAmounts);
+      results.push(...result);
     }
     return results;
   }
   /**
    * Processes a single batch of leaves for swapping.
    */
-  async processSwapBatch(leavesBatch, targetAmount) {
+  async processSwapBatch(leavesBatch, targetAmounts) {
     const leafKeyTweaks = await Promise.all(
       leavesBatch.map(async (leaf) => ({
         leaf,
@@ -4762,8 +4869,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       request = await sspClient.requestLeaveSwap({
         userLeaves,
         adaptorPubkey,
-        targetAmountSats: targetAmount || leavesBatch.reduce((acc, leaf) => acc + leaf.value, 0),
+        targetAmountSats: targetAmounts?.reduce((acc, amount) => acc + amount, 0) || leavesBatch.reduce((acc, leaf) => acc + leaf.value, 0),
         totalAmountSats: leavesBatch.reduce((acc, leaf) => acc + leaf.value, 0),
+        targetAmountSatsList: targetAmounts,
         // TODO: Request fee from SSP
         feeSats: 0,
         idempotencyKey: uuidv74()
@@ -4819,11 +4927,21 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         userOutboundTransferExternalId: transfer.id,
         leavesSwapRequestId: request.id
       });
-      if (!completeResponse) {
+      if (!completeResponse || !completeResponse.inboundTransfer?.sparkId) {
         throw new Error("Failed to complete leaves swap");
       }
-      await this.claimTransfers(40 /* COUNTER_SWAP */);
-      return completeResponse;
+      const incomingTransfer = await this.transferService.queryTransfer(
+        completeResponse.inboundTransfer.sparkId
+      );
+      if (!incomingTransfer) {
+        throw new Error("Failed to get incoming transfer");
+      }
+      return await this.claimTransfer({
+        transfer: incomingTransfer,
+        emit: false,
+        retryCount: 0,
+        optimize: false
+      });
     } catch (e) {
       await this.cancelAllSenderInitiatedTransfers();
       throw new Error(`Failed to request leaves swap: ${e}`);
@@ -5360,13 +5478,45 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string[]>} The unused deposit addresses
    */
   async getUnusedDepositAddresses() {
+    return (await this.queryAllUnusedDepositAddresses({})).map(
+      (addr) => addr.depositAddress
+    );
+  }
+  /**
+   * Gets all unused deposit addresses for the wallet.
+   *
+   * @param {Object} params - Parameters for querying unused deposit addresses
+   * @param {Uint8Array<ArrayBufferLike>} [params.identityPublicKey] - The identity public key
+   * @param {NetworkProto} [params.network] - The network
+   * @returns {Promise<DepositAddressQueryResult[]>} The unused deposit addresses
+   */
+  async queryAllUnusedDepositAddresses({
+    identityPublicKey,
+    network
+  }) {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
-    return (await sparkClient.query_unused_deposit_addresses({
-      identityPublicKey: await this.config.signer.getIdentityPublicKey(),
-      network: NetworkToProto[this.config.getNetwork()]
-    })).depositAddresses.map((addr) => addr.depositAddress);
+    let limit = 100;
+    let offset = 0;
+    const pastOffsets = /* @__PURE__ */ new Set();
+    const depositAddresses = [];
+    while (offset >= 0) {
+      if (pastOffsets.has(offset)) {
+        console.warn("Offset has already been seen, stopping");
+        break;
+      }
+      const response = await sparkClient.query_unused_deposit_addresses({
+        identityPublicKey: identityPublicKey ?? await this.config.signer.getIdentityPublicKey(),
+        network: network ?? NetworkToProto[this.config.getNetwork()],
+        limit,
+        offset
+      });
+      depositAddresses.push(...response.depositAddresses);
+      pastOffsets.add(offset);
+      offset = response.offset;
+    }
+    return depositAddresses;
   }
   /**
    * Claims a deposit to the wallet.
@@ -5415,14 +5565,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         });
       }
       const depositTx = getTxFromRawTxHex(txHex);
-      const sparkClient = await this.connectionManager.createSparkClient(
-        this.config.getCoordinatorAddress()
-      );
       const unusedDepositAddresses = new Map(
-        (await sparkClient.query_unused_deposit_addresses({
+        (await this.queryAllUnusedDepositAddresses({
           identityPublicKey: await this.config.signer.getIdentityPublicKey(),
           network: NetworkToProto[this.config.getNetwork()]
-        })).depositAddresses.map((addr) => [addr.depositAddress, addr])
+        })).map((addr) => [addr.depositAddress, addr])
       );
       let depositAddress;
       let vout = 0;
@@ -5476,14 +5623,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    */
   async advancedDeposit(txHex) {
     const depositTx = getTxFromRawTxHex(txHex);
-    const sparkClient = await this.connectionManager.createSparkClient(
-      this.config.getCoordinatorAddress()
-    );
     const unusedDepositAddresses = new Map(
-      (await sparkClient.query_unused_deposit_addresses({
+      (await this.queryAllUnusedDepositAddresses({
         identityPublicKey: await this.config.signer.getIdentityPublicKey(),
         network: NetworkToProto[this.config.getNetwork()]
-      })).depositAddresses.map((addr) => [addr.depositAddress, addr])
+      })).map((addr) => [addr.depositAddress, addr])
     );
     let vout = 0;
     const responses = [];
@@ -5587,7 +5731,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       hexToBytes7(receiverAddress.identityPublicKey)
     );
     return await this.withLeaves(async () => {
-      let leavesToSend = await this.selectLeaves(amountSats);
+      let leavesToSend = (await this.selectLeaves([amountSats])).get(
+        amountSats
+      );
       leavesToSend = await this.checkRefreshTimelockNodes(leavesToSend);
       leavesToSend = await this.checkExtendTimeLockNodes(leavesToSend);
       const leafKeyTweaks = await Promise.all(
@@ -5830,7 +5976,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       if (type && transfer.type !== type) {
         continue;
       }
-      if (transfer.status !== 2 /* TRANSFER_STATUS_SENDER_KEY_TWEAKED */ && transfer.status !== 3 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAKED */ && transfer.status !== 4 /* TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED */ && transfer.status !== 10 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAK_APPLIED */) {
+      if (transfer.status !== 2 /* TRANSFER_STATUS_SENDER_KEY_TWEAKED */ && transfer.status !== 3 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAKED */ && transfer.status !== 4 /* TRANSFER_STATUS_RECEIVER_REFUND_SIGNED */ && transfer.status !== 10 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAK_APPLIED */) {
         continue;
       }
       promises.push(
@@ -6089,7 +6235,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           expected: `${totalAmount} sats`
         });
       }
-      let leaves = await this.selectLeaves(totalAmount);
+      let leaves = (await this.selectLeaves([totalAmount])).get(totalAmount);
       leaves = await this.checkRefreshTimelockNodes(leaves);
       leaves = await this.checkExtendTimeLockNodes(leaves);
       const leavesToSend = await Promise.all(
@@ -6199,13 +6345,18 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    *
    * @param {Object} params - Parameters for the withdrawal
    * @param {string} params.onchainAddress - The Bitcoin address where the funds should be sent
-   * @param {number} [params.amountSats] - The amount in satoshis to withdraw. If not specified, attempts to withdraw all available funds
+   * @param {CoopExitFeeQuote} params.feeQuote - The fee quote for the withdrawal
+   * @param {ExitSpeed} params.exitSpeed - The exit speed chosen for the withdrawal
+   * @param {number} [params.amountSats] - The amount in satoshis to withdraw. If not specified, attempts to withdraw all available funds and deductFeeFromWithdrawalAmount is set to true.
+   * @param {boolean} [params.deductFeeFromWithdrawalAmount] - Controls how the withdrawal fee is handled. If true, the fee is deducted from the withdrawal amount (amountSats), meaning the recipient will receive amountSats minus the fee. If false, the fee is paid separately from the wallet balance, meaning the recipient will receive the full amountSats.
    * @returns {Promise<CoopExitRequest | null | undefined>} The withdrawal request details, or null/undefined if the request cannot be completed
    */
   async withdraw({
     onchainAddress,
     exitSpeed,
-    amountSats
+    feeQuote,
+    amountSats,
+    deductFeeFromWithdrawalAmount = true
   }) {
     if (!Number.isSafeInteger(amountSats)) {
       throw new ValidationError("Sats amount must be less than 2^53", {
@@ -6215,7 +6366,13 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
     }
     return await this.withLeaves(async () => {
-      return await this.coopExit(onchainAddress, exitSpeed, amountSats);
+      return await this.coopExit(
+        onchainAddress,
+        feeQuote,
+        exitSpeed,
+        deductFeeFromWithdrawalAmount,
+        amountSats
+      );
     });
   }
   /**
@@ -6226,7 +6383,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<Object | null | undefined>} The exit request details
    * @private
    */
-  async coopExit(onchainAddress, exitSpeed, targetAmountSats) {
+  async coopExit(onchainAddress, feeEstimate, exitSpeed, deductFeeFromWithdrawalAmount, targetAmountSats) {
     if (!Number.isSafeInteger(targetAmountSats)) {
       throw new ValidationError("Sats amount must be less than 2^53", {
         field: "targetAmountSats",
@@ -6234,41 +6391,34 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         expected: "smaller or equal to " + Number.MAX_SAFE_INTEGER
       });
     }
-    let leavesToSend = [];
-    if (targetAmountSats) {
-      leavesToSend = await this.selectLeaves(targetAmountSats);
-    } else {
-      leavesToSend = this.leaves.map((leaf) => ({
-        ...leaf
-      }));
+    if (!targetAmountSats) {
+      deductFeeFromWithdrawalAmount = true;
     }
-    const sspClient = this.getSspClient();
-    const feeEstimate = await sspClient.getCoopExitFeeEstimate({
-      leafExternalIds: leavesToSend.map((leaf) => leaf.id),
-      withdrawalAddress: onchainAddress
-    });
-    if (feeEstimate) {
-      let fee;
-      switch (exitSpeed) {
-        case ExitSpeed_default.FAST:
-          fee = (feeEstimate.speedFast?.l1BroadcastFee.originalValue || 0) + (feeEstimate.speedFast?.userFee.originalValue || 0);
-          break;
-        case ExitSpeed_default.MEDIUM:
-          fee = (feeEstimate.speedMedium?.l1BroadcastFee.originalValue || 0) + (feeEstimate.speedMedium?.userFee.originalValue || 0);
-          break;
-        case ExitSpeed_default.SLOW:
-          fee = (feeEstimate.speedSlow?.l1BroadcastFee.originalValue || 0) + (feeEstimate.speedSlow?.userFee.originalValue || 0);
-          break;
-        default:
-          throw new ValidationError("Invalid exit speed", {
-            field: "exitSpeed",
-            value: exitSpeed,
-            expected: "FAST, MEDIUM, or SLOW"
-          });
-      }
-      if (fee !== void 0 && fee > leavesToSend.reduce((acc, leaf) => acc + leaf.value, 0)) {
+    let fee;
+    switch (exitSpeed) {
+      case ExitSpeed_default.FAST:
+        fee = (feeEstimate.l1BroadcastFeeFast?.originalValue || 0) + (feeEstimate.userFeeFast?.originalValue || 0);
+        break;
+      case ExitSpeed_default.MEDIUM:
+        fee = (feeEstimate.l1BroadcastFeeMedium?.originalValue || 0) + (feeEstimate.userFeeMedium?.originalValue || 0);
+        break;
+      case ExitSpeed_default.SLOW:
+        fee = (feeEstimate.l1BroadcastFeeSlow?.originalValue || 0) + (feeEstimate.userFeeSlow?.originalValue || 0);
+        break;
+      default:
+        throw new ValidationError("Invalid exit speed", {
+          field: "exitSpeed",
+          value: exitSpeed,
+          expected: "FAST, MEDIUM, or SLOW"
+        });
+    }
+    let leavesToSendToSsp = [];
+    let leavesToSendToSE = [];
+    if (deductFeeFromWithdrawalAmount) {
+      leavesToSendToSsp = targetAmountSats ? (await this.selectLeaves([targetAmountSats])).get(targetAmountSats) : this.leaves;
+      if (fee > leavesToSendToSsp.reduce((acc, leaf) => acc + leaf.value, 0)) {
         throw new ValidationError(
-          "The fee for the withdrawal is greater than the target amount",
+          "The fee for the withdrawal is greater than the target withdrawal amount",
           {
             field: "fee",
             value: fee,
@@ -6276,11 +6426,32 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           }
         );
       }
+    } else {
+      if (!targetAmountSats) {
+        throw new ValidationError(
+          "targetAmountSats is required when deductFeeFromWithdrawalAmount is false",
+          {
+            field: "targetAmountSats",
+            value: targetAmountSats,
+            expected: "defined when deductFeeFromWithdrawalAmount is false"
+          }
+        );
+      }
+      const leaves = await this.selectLeaves([targetAmountSats, fee]);
+      const leavesForTargetAmount = leaves.get(targetAmountSats);
+      const leavesForFee = leaves.get(fee);
+      if (!leavesForTargetAmount || !leavesForFee) {
+        throw new Error("Failed to select leaves for target amount and fee");
+      }
+      leavesToSendToSsp = leavesForTargetAmount;
+      leavesToSendToSE = leavesForFee;
     }
-    leavesToSend = await this.checkRefreshTimelockNodes(leavesToSend);
-    leavesToSend = await this.checkExtendTimeLockNodes(leavesToSend);
+    leavesToSendToSsp = await this.checkRefreshTimelockNodes(leavesToSendToSsp);
+    leavesToSendToSsp = await this.checkExtendTimeLockNodes(leavesToSendToSsp);
+    leavesToSendToSE = await this.checkRefreshTimelockNodes(leavesToSendToSE);
+    leavesToSendToSE = await this.checkExtendTimeLockNodes(leavesToSendToSE);
     const leafKeyTweaks = await Promise.all(
-      leavesToSend.map(async (leaf) => ({
+      [...leavesToSendToSE, ...leavesToSendToSsp].map(async (leaf) => ({
         leaf,
         signingPubKey: await this.config.signer.generatePublicKey(
           sha2567(leaf.id)
@@ -6288,13 +6459,23 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         newSigningPubKey: await this.config.signer.generatePublicKey()
       }))
     );
-    const coopExitRequest = await sspClient.requestCoopExit({
-      leafExternalIds: leavesToSend.map((leaf) => leaf.id),
+    const requestCoopExitParams = {
+      leafExternalIds: leavesToSendToSsp.map((leaf) => leaf.id),
       withdrawalAddress: onchainAddress,
       idempotencyKey: uuidv74(),
       exitSpeed,
-      withdrawAll: true
-    });
+      withdrawAll: deductFeeFromWithdrawalAmount
+    };
+    if (!deductFeeFromWithdrawalAmount) {
+      requestCoopExitParams.feeQuoteId = feeEstimate.id;
+      requestCoopExitParams.feeLeafExternalIds = leavesToSendToSE.map(
+        (leaf) => leaf.id
+      );
+    }
+    const sspClient = this.getSspClient();
+    const coopExitRequest = await sspClient.requestCoopExit(
+      requestCoopExitParams
+    );
     if (!coopExitRequest?.rawConnectorTransaction) {
       throw new Error("Failed to request coop exit");
     }
@@ -6332,9 +6513,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @param {Object} params - Input parameters for fee estimation
    * @param {number} params.amountSats - The amount in satoshis to withdraw
    * @param {string} params.withdrawalAddress - The Bitcoin address where the funds should be sent
-   * @returns {Promise<CoopExitFeeEstimatesOutput | null>} Fee estimate for the withdrawal
+   * @returns {Promise<CoopExitFeeQuote | null>} Fee estimate for the withdrawal
    */
-  async getWithdrawalFeeEstimate({
+  async getWithdrawalFeeQuote({
     amountSats,
     withdrawalAddress
   }) {
@@ -6346,10 +6527,10 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         expected: "smaller or equal to " + Number.MAX_SAFE_INTEGER
       });
     }
-    let leaves = await this.selectLeaves(amountSats);
+    let leaves = (await this.selectLeaves([amountSats])).get(amountSats);
     leaves = await this.checkRefreshTimelockNodes(leaves);
     leaves = await this.checkExtendTimeLockNodes(leaves);
-    const feeEstimate = await sspClient.getCoopExitFeeEstimate({
+    const feeEstimate = await sspClient.getCoopExitFeeQuote({
       leafExternalIds: leaves.map((leaf) => leaf.id),
       withdrawalAddress
     });