@buildonspark/spark-sdk 0.1.43 → 0.1.44

package/dist/index.cjs

@@ -1494,7 +1494,7 @@ var import_uuidv75 = require("uuidv7");
 
 // src/graphql/client.ts
 init_buffer();
-var import_core6 = require("@lightsparkdev/core");
+var import_core7 = require("@lightsparkdev/core");
 var import_sha2 = require("@noble/hashes/sha2");
 
 // src/graphql/mutations/ClaimStaticDeposit.ts
@@ -2063,6 +2063,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: {
@@ -2070,6 +2073,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 {
@@ -2314,6 +2320,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
@@ -2322,6 +2329,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
@@ -2462,6 +2470,106 @@ fragment CoopExitFeeEstimatesOutputFragment on CoopExitFeeEstimatesOutput {
     }
 }`;
 
+// src/graphql/objects/CoopExitFeeQuote.ts
+init_buffer();
+var import_core5 = require("@lightsparkdev/core");
+var CoopExitFeeQuoteFromJson = (obj) => {
+  return {
+    id: obj["coop_exit_fee_quote_id"],
+    createdAt: obj["coop_exit_fee_quote_created_at"],
+    updatedAt: obj["coop_exit_fee_quote_updated_at"],
+    network: BitcoinNetwork_default[obj["coop_exit_fee_quote_network"]] ?? BitcoinNetwork_default.FUTURE_VALUE,
+    totalAmount: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_total_amount"]
+    ),
+    userFeeFast: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_user_fee_fast"]
+    ),
+    userFeeMedium: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_user_fee_medium"]
+    ),
+    userFeeSlow: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_user_fee_slow"]
+    ),
+    l1BroadcastFeeFast: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_l1_broadcast_fee_fast"]
+    ),
+    l1BroadcastFeeMedium: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_l1_broadcast_fee_medium"]
+    ),
+    l1BroadcastFeeSlow: CurrencyAmountFromJson(
+      obj["coop_exit_fee_quote_l1_broadcast_fee_slow"]
+    ),
+    expiresAt: obj["coop_exit_fee_quote_expires_at"],
+    typename: "CoopExitFeeQuote"
+  };
+};
+var FRAGMENT10 = `
+fragment CoopExitFeeQuoteFragment on CoopExitFeeQuote {
+    __typename
+    coop_exit_fee_quote_id: id
+    coop_exit_fee_quote_created_at: created_at
+    coop_exit_fee_quote_updated_at: updated_at
+    coop_exit_fee_quote_network: network
+    coop_exit_fee_quote_total_amount: total_amount {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_user_fee_fast: user_fee_fast {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_user_fee_medium: user_fee_medium {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_user_fee_slow: user_fee_slow {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_l1_broadcast_fee_fast: l1_broadcast_fee_fast {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_l1_broadcast_fee_medium: l1_broadcast_fee_medium {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_l1_broadcast_fee_slow: l1_broadcast_fee_slow {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    coop_exit_fee_quote_expires_at: expires_at
+}`;
+
 // src/graphql/objects/LeavesSwapFeeEstimateOutput.ts
 init_buffer();
 var LeavesSwapFeeEstimateOutputFromJson = (obj) => {
@@ -2469,7 +2577,7 @@ var LeavesSwapFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["leaves_swap_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT10 = `
+var FRAGMENT11 = `
 fragment LeavesSwapFeeEstimateOutputFragment on LeavesSwapFeeEstimateOutput {
     __typename
     leaves_swap_fee_estimate_output_fee_estimate: fee_estimate {
@@ -2489,7 +2597,7 @@ var LightningSendFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["lightning_send_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT11 = `
+var FRAGMENT12 = `
 fragment LightningSendFeeEstimateOutputFragment on LightningSendFeeEstimateOutput {
     __typename
     lightning_send_fee_estimate_output_fee_estimate: fee_estimate {
@@ -2513,7 +2621,7 @@ var StaticDepositQuoteOutputFromJson = (obj) => {
     signature: obj["static_deposit_quote_output_signature"]
   };
 };
-var FRAGMENT12 = `
+var FRAGMENT13 = `
 fragment StaticDepositQuoteOutputFragment on StaticDepositQuoteOutput {
     __typename
     static_deposit_quote_output_transaction_id: transaction_id
@@ -2560,7 +2668,28 @@ var GetClaimDepositQuote = `
       ...StaticDepositQuoteOutputFragment
     }
   }
-  ${FRAGMENT12}
+  ${FRAGMENT13}
+`;
+
+// src/graphql/queries/GetCoopExitFeeQuote.ts
+init_buffer();
+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
+      }
+    }
+  }
+  ${FRAGMENT10}
 `;
 
 // src/graphql/queries/LeavesSwapFeeEstimate.ts
@@ -2577,7 +2706,7 @@ var LeavesSwapFeeEstimate = `
       ...LeavesSwapFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT10}
+  ${FRAGMENT11}
 `;
 
 // src/graphql/queries/LightningSendFeeEstimate.ts
@@ -2596,7 +2725,7 @@ var LightningSendFeeEstimate = `
       ...LightningSendFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT11}
+  ${FRAGMENT12}
 `;
 
 // src/graphql/queries/Transfer.ts
@@ -2615,13 +2744,13 @@ init_buffer();
 
 // src/graphql/objects/UserRequest.ts
 init_buffer();
-var import_core5 = require("@lightsparkdev/core");
+var import_core6 = require("@lightsparkdev/core");
 
 // src/graphql/objects/ClaimStaticDepositStatus.ts
 init_buffer();
 
 // src/graphql/objects/UserRequest.ts
-var FRAGMENT13 = `
+var FRAGMENT14 = `
 fragment UserRequestFragment on UserRequest {
     __typename
     ... on ClaimStaticDeposit {
@@ -2853,7 +2982,7 @@ var UserRequest2 = `
       ...UserRequestFragment
     }
   }
-  ${FRAGMENT13}
+  ${FRAGMENT14}
 `;
 
 // src/graphql/client.ts
@@ -2866,13 +2995,13 @@ var SspClient = class {
     this.authProvider = new SparkAuthProvider();
     const fetchFunction = typeof window !== "undefined" ? window.fetch.bind(window) : fetch;
     const options = config.sspClientOptions;
-    this.requester = new import_core6.Requester(
-      new import_core6.NodeKeyCache(import_core6.DefaultCrypto),
+    this.requester = new import_core7.Requester(
+      new import_core7.NodeKeyCache(import_core7.DefaultCrypto),
       options.schemaEndpoint || `graphql/spark/2025-03-19`,
       `spark-sdk/0.0.0`,
       this.authProvider,
       options.baseUrl,
-      import_core6.DefaultCrypto,
+      import_core7.DefaultCrypto,
       void 0,
       fetchFunction
     );
@@ -2975,7 +3104,10 @@ var SspClient = class {
     leafExternalIds,
     withdrawalAddress,
     idempotencyKey,
-    exitSpeed
+    exitSpeed,
+    feeLeafExternalIds,
+    feeQuoteId,
+    withdrawAll
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestCoopExit,
@@ -2983,7 +3115,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);
@@ -3045,7 +3180,8 @@ var SspClient = class {
     targetAmountSats,
     feeSats,
     userLeaves,
-    idempotencyKey
+    idempotencyKey,
+    targetAmountSatsList
   }) {
     const query = {
       queryPayload: RequestSwapLeaves,
@@ -3055,7 +3191,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) {
@@ -3198,7 +3335,7 @@ var SspClient = class {
       {
         queryPayload: GetChallenge,
         variables: {
-          public_key: (0, import_core6.bytesToHex)(await this.signer.getIdentityPublicKey())
+          public_key: (0, import_core7.bytesToHex)(await this.signer.getIdentityPublicKey())
         },
         constructObject: (response) => {
           return GetChallengeOutputFromJson(response.get_challenge);
@@ -3214,7 +3351,7 @@ var SspClient = class {
         variables: {
           protected_challenge: protectedChallenge,
           signature,
-          identity_public_key: (0, import_core6.bytesToHex)(
+          identity_public_key: (0, import_core7.bytesToHex)(
             await this.signer.getIdentityPublicKey()
           )
         },
@@ -3247,6 +3384,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;
@@ -3288,10 +3440,6 @@ init_buffer();
 
 // src/graphql/objects/ClaimStaticDeposit.ts
 init_buffer();
-var import_core7 = require("@lightsparkdev/core");
-
-// src/graphql/objects/CoopExitFeeQuote.ts
-init_buffer();
 var import_core8 = require("@lightsparkdev/core");
 
 // src/graphql/objects/SparkUserRequestStatus.ts
@@ -3680,7 +3828,7 @@ var TransferStatus = /* @__PURE__ */ ((TransferStatus2) => {
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_SENDER_KEY_TWEAK_PENDING"] = 1] = "TRANSFER_STATUS_SENDER_KEY_TWEAK_PENDING";
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_SENDER_KEY_TWEAKED"] = 2] = "TRANSFER_STATUS_SENDER_KEY_TWEAKED";
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_RECEIVER_KEY_TWEAKED"] = 3] = "TRANSFER_STATUS_RECEIVER_KEY_TWEAKED";
-  TransferStatus2[TransferStatus2["TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED"] = 4] = "TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED";
+  TransferStatus2[TransferStatus2["TRANSFER_STATUS_RECEIVER_REFUND_SIGNED"] = 4] = "TRANSFER_STATUS_RECEIVER_REFUND_SIGNED";
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_COMPLETED"] = 5] = "TRANSFER_STATUS_COMPLETED";
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_EXPIRED"] = 6] = "TRANSFER_STATUS_EXPIRED";
   TransferStatus2[TransferStatus2["TRANSFER_STATUS_RETURNED"] = 7] = "TRANSFER_STATUS_RETURNED";
@@ -3705,8 +3853,8 @@ function transferStatusFromJSON(object) {
     case "TRANSFER_STATUS_RECEIVER_KEY_TWEAKED":
       return 3 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAKED */;
     case 4:
-    case "TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED":
-      return 4 /* TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED */;
+    case "TRANSFER_STATUS_RECEIVER_REFUND_SIGNED":
+      return 4 /* TRANSFER_STATUS_RECEIVER_REFUND_SIGNED */;
     case 5:
     case "TRANSFER_STATUS_COMPLETED":
       return 5 /* TRANSFER_STATUS_COMPLETED */;
@@ -3741,8 +3889,8 @@ function transferStatusToJSON(object) {
       return "TRANSFER_STATUS_SENDER_KEY_TWEAKED";
     case 3 /* TRANSFER_STATUS_RECEIVER_KEY_TWEAKED */:
       return "TRANSFER_STATUS_RECEIVER_KEY_TWEAKED";
-    case 4 /* TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED */:
-      return "TRANSFER_STATUSR_RECEIVER_REFUND_SIGNED";
+    case 4 /* TRANSFER_STATUS_RECEIVER_REFUND_SIGNED */:
+      return "TRANSFER_STATUS_RECEIVER_REFUND_SIGNED";
     case 5 /* TRANSFER_STATUS_COMPLETED */:
       return "TRANSFER_STATUS_COMPLETED";
     case 6 /* TRANSFER_STATUS_EXPIRED */:
@@ -4834,7 +4982,7 @@ var SigningJob = {
   }
 };
 function createBaseSigningKeyshare() {
-  return { ownerIdentifiers: [], threshold: 0, publicKey: new Uint8Array(0) };
+  return { ownerIdentifiers: [], threshold: 0, publicKey: new Uint8Array(0), publicShares: {}, updatedTime: void 0 };
 }
 var SigningKeyshare = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
@@ -4847,6 +4995,12 @@ var SigningKeyshare = {
     if (message.publicKey.length !== 0) {
       writer.uint32(26).bytes(message.publicKey);
     }
+    Object.entries(message.publicShares).forEach(([key, value]) => {
+      SigningKeyshare_PublicSharesEntry.encode({ key, value }, writer.uint32(34).fork()).join();
+    });
+    if (message.updatedTime !== void 0) {
+      Timestamp.encode(toTimestamp(message.updatedTime), writer.uint32(42).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -4877,6 +5031,23 @@ var SigningKeyshare = {
           message.publicKey = reader.bytes();
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          const entry4 = SigningKeyshare_PublicSharesEntry.decode(reader, reader.uint32());
+          if (entry4.value !== void 0) {
+            message.publicShares[entry4.key] = entry4.value;
+          }
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+          message.updatedTime = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -4889,7 +5060,12 @@ var SigningKeyshare = {
     return {
       ownerIdentifiers: globalThis.Array.isArray(object?.ownerIdentifiers) ? object.ownerIdentifiers.map((e) => globalThis.String(e)) : [],
       threshold: isSet3(object.threshold) ? globalThis.Number(object.threshold) : 0,
-      publicKey: isSet3(object.publicKey) ? bytesFromBase642(object.publicKey) : new Uint8Array(0)
+      publicKey: isSet3(object.publicKey) ? bytesFromBase642(object.publicKey) : new Uint8Array(0),
+      publicShares: isObject9(object.publicShares) ? Object.entries(object.publicShares).reduce((acc, [key, value]) => {
+        acc[key] = bytesFromBase642(value);
+        return acc;
+      }, {}) : {},
+      updatedTime: isSet3(object.updatedTime) ? fromJsonTimestamp(object.updatedTime) : void 0
     };
   },
   toJSON(message) {
@@ -4903,6 +5079,18 @@ var SigningKeyshare = {
     if (message.publicKey.length !== 0) {
       obj.publicKey = base64FromBytes2(message.publicKey);
     }
+    if (message.publicShares) {
+      const entries = Object.entries(message.publicShares);
+      if (entries.length > 0) {
+        obj.publicShares = {};
+        entries.forEach(([k, v]) => {
+          obj.publicShares[k] = base64FromBytes2(v);
+        });
+      }
+    }
+    if (message.updatedTime !== void 0) {
+      obj.updatedTime = message.updatedTime.toISOString();
+    }
     return obj;
   },
   create(base) {
@@ -4913,6 +5101,84 @@ var SigningKeyshare = {
     message.ownerIdentifiers = object.ownerIdentifiers?.map((e) => e) || [];
     message.threshold = object.threshold ?? 0;
     message.publicKey = object.publicKey ?? new Uint8Array(0);
+    message.publicShares = Object.entries(object.publicShares ?? {}).reduce(
+      (acc, [key, value]) => {
+        if (value !== void 0) {
+          acc[key] = value;
+        }
+        return acc;
+      },
+      {}
+    );
+    message.updatedTime = object.updatedTime ?? void 0;
+    return message;
+  }
+};
+function createBaseSigningKeyshare_PublicSharesEntry() {
+  return { key: "", value: new Uint8Array(0) };
+}
+var SigningKeyshare_PublicSharesEntry = {
+  encode(message, writer = new import_wire4.BinaryWriter()) {
+    if (message.key !== "") {
+      writer.uint32(10).string(message.key);
+    }
+    if (message.value.length !== 0) {
+      writer.uint32(18).bytes(message.value);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof import_wire4.BinaryReader ? input : new import_wire4.BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSigningKeyshare_PublicSharesEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.key = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.value = reader.bytes();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      key: isSet3(object.key) ? globalThis.String(object.key) : "",
+      value: isSet3(object.value) ? bytesFromBase642(object.value) : new Uint8Array(0)
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.key !== "") {
+      obj.key = message.key;
+    }
+    if (message.value.length !== 0) {
+      obj.value = base64FromBytes2(message.value);
+    }
+    return obj;
+  },
+  create(base) {
+    return SigningKeyshare_PublicSharesEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSigningKeyshare_PublicSharesEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? new Uint8Array(0);
     return message;
   }
 };
@@ -6609,7 +6875,8 @@ function createBaseStartTokenTransactionRequest() {
   return {
     identityPublicKey: new Uint8Array(0),
     partialTokenTransaction: void 0,
-    tokenTransactionSignatures: void 0
+    tokenTransactionSignatures: void 0,
+    sparkPaymentIntent: ""
   };
 }
 var StartTokenTransactionRequest = {
@@ -6623,6 +6890,9 @@ var StartTokenTransactionRequest = {
     if (message.tokenTransactionSignatures !== void 0) {
       TokenTransactionSignatures.encode(message.tokenTransactionSignatures, writer.uint32(26).fork()).join();
     }
+    if (message.sparkPaymentIntent !== "") {
+      writer.uint32(34).string(message.sparkPaymentIntent);
+    }
     return writer;
   },
   decode(input, length) {
@@ -6653,6 +6923,13 @@ var StartTokenTransactionRequest = {
           message.tokenTransactionSignatures = TokenTransactionSignatures.decode(reader, reader.uint32());
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.sparkPaymentIntent = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -6665,7 +6942,8 @@ var StartTokenTransactionRequest = {
     return {
       identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0),
       partialTokenTransaction: isSet3(object.partialTokenTransaction) ? TokenTransaction.fromJSON(object.partialTokenTransaction) : void 0,
-      tokenTransactionSignatures: isSet3(object.tokenTransactionSignatures) ? TokenTransactionSignatures.fromJSON(object.tokenTransactionSignatures) : void 0
+      tokenTransactionSignatures: isSet3(object.tokenTransactionSignatures) ? TokenTransactionSignatures.fromJSON(object.tokenTransactionSignatures) : void 0,
+      sparkPaymentIntent: isSet3(object.sparkPaymentIntent) ? globalThis.String(object.sparkPaymentIntent) : ""
     };
   },
   toJSON(message) {
@@ -6679,6 +6957,9 @@ var StartTokenTransactionRequest = {
     if (message.tokenTransactionSignatures !== void 0) {
       obj.tokenTransactionSignatures = TokenTransactionSignatures.toJSON(message.tokenTransactionSignatures);
     }
+    if (message.sparkPaymentIntent !== "") {
+      obj.sparkPaymentIntent = message.sparkPaymentIntent;
+    }
     return obj;
   },
   create(base) {
@@ -6689,6 +6970,7 @@ var StartTokenTransactionRequest = {
     message.identityPublicKey = object.identityPublicKey ?? new Uint8Array(0);
     message.partialTokenTransaction = object.partialTokenTransaction !== void 0 && object.partialTokenTransaction !== null ? TokenTransaction.fromPartial(object.partialTokenTransaction) : void 0;
     message.tokenTransactionSignatures = object.tokenTransactionSignatures !== void 0 && object.tokenTransactionSignatures !== null ? TokenTransactionSignatures.fromPartial(object.tokenTransactionSignatures) : void 0;
+    message.sparkPaymentIntent = object.sparkPaymentIntent ?? "";
     return message;
   }
 };
@@ -7186,7 +7468,12 @@ var RevocationSecretWithIndex = {
   }
 };
 function createBaseFinalizeTokenTransactionRequest() {
-  return { finalTokenTransaction: void 0, revocationSecrets: [], identityPublicKey: new Uint8Array(0) };
+  return {
+    finalTokenTransaction: void 0,
+    revocationSecrets: [],
+    identityPublicKey: new Uint8Array(0),
+    sparkPaymentIntent: ""
+  };
 }
 var FinalizeTokenTransactionRequest = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
@@ -7199,6 +7486,9 @@ var FinalizeTokenTransactionRequest = {
     if (message.identityPublicKey.length !== 0) {
       writer.uint32(26).bytes(message.identityPublicKey);
     }
+    if (message.sparkPaymentIntent !== "") {
+      writer.uint32(34).string(message.sparkPaymentIntent);
+    }
     return writer;
   },
   decode(input, length) {
@@ -7229,6 +7519,13 @@ var FinalizeTokenTransactionRequest = {
           message.identityPublicKey = reader.bytes();
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.sparkPaymentIntent = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -7241,7 +7538,8 @@ var FinalizeTokenTransactionRequest = {
     return {
       finalTokenTransaction: isSet3(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0,
       revocationSecrets: globalThis.Array.isArray(object?.revocationSecrets) ? object.revocationSecrets.map((e) => RevocationSecretWithIndex.fromJSON(e)) : [],
-      identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0)
+      identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0),
+      sparkPaymentIntent: isSet3(object.sparkPaymentIntent) ? globalThis.String(object.sparkPaymentIntent) : ""
     };
   },
   toJSON(message) {
@@ -7255,6 +7553,9 @@ var FinalizeTokenTransactionRequest = {
     if (message.identityPublicKey.length !== 0) {
       obj.identityPublicKey = base64FromBytes2(message.identityPublicKey);
     }
+    if (message.sparkPaymentIntent !== "") {
+      obj.sparkPaymentIntent = message.sparkPaymentIntent;
+    }
     return obj;
   },
   create(base) {
@@ -7265,6 +7566,7 @@ var FinalizeTokenTransactionRequest = {
     message.finalTokenTransaction = object.finalTokenTransaction !== void 0 && object.finalTokenTransaction !== null ? TokenTransaction.fromPartial(object.finalTokenTransaction) : void 0;
     message.revocationSecrets = object.revocationSecrets?.map((e) => RevocationSecretWithIndex.fromPartial(e)) || [];
     message.identityPublicKey = object.identityPublicKey ?? new Uint8Array(0);
+    message.sparkPaymentIntent = object.sparkPaymentIntent ?? "";
     return message;
   }
 };
@@ -7957,7 +8259,10 @@ function createBaseTreeNode() {
     ownerIdentityPublicKey: new Uint8Array(0),
     signingKeyshare: void 0,
     status: "",
-    network: 0
+    network: 0,
+    createdTime: void 0,
+    updatedTime: void 0,
+    ownerSigningPublicKey: new Uint8Array(0)
   };
 }
 var TreeNode = {
@@ -7998,6 +8303,15 @@ var TreeNode = {
     if (message.network !== 0) {
       writer.uint32(96).int32(message.network);
     }
+    if (message.createdTime !== void 0) {
+      Timestamp.encode(toTimestamp(message.createdTime), writer.uint32(106).fork()).join();
+    }
+    if (message.updatedTime !== void 0) {
+      Timestamp.encode(toTimestamp(message.updatedTime), writer.uint32(114).fork()).join();
+    }
+    if (message.ownerSigningPublicKey.length !== 0) {
+      writer.uint32(122).bytes(message.ownerSigningPublicKey);
+    }
     return writer;
   },
   decode(input, length) {
@@ -8091,6 +8405,27 @@ var TreeNode = {
           message.network = reader.int32();
           continue;
         }
+        case 13: {
+          if (tag !== 106) {
+            break;
+          }
+          message.createdTime = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 14: {
+          if (tag !== 114) {
+            break;
+          }
+          message.updatedTime = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 15: {
+          if (tag !== 122) {
+            break;
+          }
+          message.ownerSigningPublicKey = reader.bytes();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -8112,7 +8447,10 @@ var TreeNode = {
       ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
       signingKeyshare: isSet3(object.signingKeyshare) ? SigningKeyshare.fromJSON(object.signingKeyshare) : void 0,
       status: isSet3(object.status) ? globalThis.String(object.status) : "",
-      network: isSet3(object.network) ? networkFromJSON(object.network) : 0
+      network: isSet3(object.network) ? networkFromJSON(object.network) : 0,
+      createdTime: isSet3(object.createdTime) ? fromJsonTimestamp(object.createdTime) : void 0,
+      updatedTime: isSet3(object.updatedTime) ? fromJsonTimestamp(object.updatedTime) : void 0,
+      ownerSigningPublicKey: isSet3(object.ownerSigningPublicKey) ? bytesFromBase642(object.ownerSigningPublicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -8153,6 +8491,15 @@ var TreeNode = {
     if (message.network !== 0) {
       obj.network = networkToJSON(message.network);
     }
+    if (message.createdTime !== void 0) {
+      obj.createdTime = message.createdTime.toISOString();
+    }
+    if (message.updatedTime !== void 0) {
+      obj.updatedTime = message.updatedTime.toISOString();
+    }
+    if (message.ownerSigningPublicKey.length !== 0) {
+      obj.ownerSigningPublicKey = base64FromBytes2(message.ownerSigningPublicKey);
+    }
     return obj;
   },
   create(base) {
@@ -8172,6 +8519,9 @@ var TreeNode = {
     message.signingKeyshare = object.signingKeyshare !== void 0 && object.signingKeyshare !== null ? SigningKeyshare.fromPartial(object.signingKeyshare) : void 0;
     message.status = object.status ?? "";
     message.network = object.network ?? 0;
+    message.createdTime = object.createdTime ?? void 0;
+    message.updatedTime = object.updatedTime ?? void 0;
+    message.ownerSigningPublicKey = object.ownerSigningPublicKey ?? new Uint8Array(0);
     return message;
   }
 };
@@ -8774,7 +9124,8 @@ function createBaseStartTransferRequest() {
     leavesToSend: [],
     receiverIdentityPublicKey: new Uint8Array(0),
     expiryTime: void 0,
-    transferPackage: void 0
+    transferPackage: void 0,
+    sparkPaymentIntent: ""
   };
 }
 var StartTransferRequest = {
@@ -8797,6 +9148,9 @@ var StartTransferRequest = {
     if (message.transferPackage !== void 0) {
       TransferPackage.encode(message.transferPackage, writer.uint32(58).fork()).join();
     }
+    if (message.sparkPaymentIntent !== "") {
+      writer.uint32(74).string(message.sparkPaymentIntent);
+    }
     return writer;
   },
   decode(input, length) {
@@ -8848,6 +9202,13 @@ var StartTransferRequest = {
           message.transferPackage = TransferPackage.decode(reader, reader.uint32());
           continue;
         }
+        case 9: {
+          if (tag !== 74) {
+            break;
+          }
+          message.sparkPaymentIntent = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -8863,7 +9224,8 @@ var StartTransferRequest = {
       leavesToSend: globalThis.Array.isArray(object?.leavesToSend) ? object.leavesToSend.map((e) => LeafRefundTxSigningJob.fromJSON(e)) : [],
       receiverIdentityPublicKey: isSet3(object.receiverIdentityPublicKey) ? bytesFromBase642(object.receiverIdentityPublicKey) : new Uint8Array(0),
       expiryTime: isSet3(object.expiryTime) ? fromJsonTimestamp(object.expiryTime) : void 0,
-      transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0
+      transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0,
+      sparkPaymentIntent: isSet3(object.sparkPaymentIntent) ? globalThis.String(object.sparkPaymentIntent) : ""
     };
   },
   toJSON(message) {
@@ -8886,6 +9248,9 @@ var StartTransferRequest = {
     if (message.transferPackage !== void 0) {
       obj.transferPackage = TransferPackage.toJSON(message.transferPackage);
     }
+    if (message.sparkPaymentIntent !== "") {
+      obj.sparkPaymentIntent = message.sparkPaymentIntent;
+    }
     return obj;
   },
   create(base) {
@@ -8899,6 +9264,7 @@ var StartTransferRequest = {
     message.receiverIdentityPublicKey = object.receiverIdentityPublicKey ?? new Uint8Array(0);
     message.expiryTime = object.expiryTime ?? void 0;
     message.transferPackage = object.transferPackage !== void 0 && object.transferPackage !== null ? TransferPackage.fromPartial(object.transferPackage) : void 0;
+    message.sparkPaymentIntent = object.sparkPaymentIntent ?? "";
     return message;
   }
 };
@@ -9418,7 +9784,7 @@ var SendLeafKeyTweak_PubkeySharesTweakEntry = {
   }
 };
 function createBaseFinalizeTransferRequest() {
-  return { transferId: "", ownerIdentityPublicKey: new Uint8Array(0), leavesToSend: [] };
+  return { transferId: "", ownerIdentityPublicKey: new Uint8Array(0), leavesToSend: [], sparkPaymentIntent: "" };
 }
 var FinalizeTransferRequest = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
@@ -9431,6 +9797,9 @@ var FinalizeTransferRequest = {
     for (const v of message.leavesToSend) {
       SendLeafKeyTweak.encode(v, writer.uint32(26).fork()).join();
     }
+    if (message.sparkPaymentIntent !== "") {
+      writer.uint32(34).string(message.sparkPaymentIntent);
+    }
     return writer;
   },
   decode(input, length) {
@@ -9461,6 +9830,13 @@ var FinalizeTransferRequest = {
           message.leavesToSend.push(SendLeafKeyTweak.decode(reader, reader.uint32()));
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.sparkPaymentIntent = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -9473,7 +9849,8 @@ var FinalizeTransferRequest = {
     return {
       transferId: isSet3(object.transferId) ? globalThis.String(object.transferId) : "",
       ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
-      leavesToSend: globalThis.Array.isArray(object?.leavesToSend) ? object.leavesToSend.map((e) => SendLeafKeyTweak.fromJSON(e)) : []
+      leavesToSend: globalThis.Array.isArray(object?.leavesToSend) ? object.leavesToSend.map((e) => SendLeafKeyTweak.fromJSON(e)) : [],
+      sparkPaymentIntent: isSet3(object.sparkPaymentIntent) ? globalThis.String(object.sparkPaymentIntent) : ""
     };
   },
   toJSON(message) {
@@ -9487,6 +9864,9 @@ var FinalizeTransferRequest = {
     if (message.leavesToSend?.length) {
       obj.leavesToSend = message.leavesToSend.map((e) => SendLeafKeyTweak.toJSON(e));
     }
+    if (message.sparkPaymentIntent !== "") {
+      obj.sparkPaymentIntent = message.sparkPaymentIntent;
+    }
     return obj;
   },
   create(base) {
@@ -9497,6 +9877,7 @@ var FinalizeTransferRequest = {
     message.transferId = object.transferId ?? "";
     message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
     message.leavesToSend = object.leavesToSend?.map((e) => SendLeafKeyTweak.fromPartial(e)) || [];
+    message.sparkPaymentIntent = object.sparkPaymentIntent ?? "";
     return message;
   }
 };
@@ -9937,7 +10318,7 @@ var TransferLeaf = {
   }
 };
 function createBaseTransferFilter() {
-  return { participant: void 0, transferIds: [], limit: 0, offset: 0, types: [], network: 0 };
+  return { participant: void 0, transferIds: [], limit: 0, offset: 0, types: [], network: 0, statuses: [] };
 }
 var TransferFilter = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
@@ -9969,6 +10350,11 @@ var TransferFilter = {
     if (message.network !== 0) {
       writer.uint32(32).int32(message.network);
     }
+    writer.uint32(642).fork();
+    for (const v of message.statuses) {
+      writer.int32(v);
+    }
+    writer.join();
     return writer;
   },
   decode(input, length) {
@@ -10044,6 +10430,20 @@ var TransferFilter = {
           message.network = reader.int32();
           continue;
         }
+        case 80: {
+          if (tag === 640) {
+            message.statuses.push(reader.int32());
+            continue;
+          }
+          if (tag === 642) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.statuses.push(reader.int32());
+            }
+            continue;
+          }
+          break;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -10065,7 +10465,8 @@ var TransferFilter = {
       limit: isSet3(object.limit) ? globalThis.Number(object.limit) : 0,
       offset: isSet3(object.offset) ? globalThis.Number(object.offset) : 0,
       types: globalThis.Array.isArray(object?.types) ? object.types.map((e) => transferTypeFromJSON(e)) : [],
-      network: isSet3(object.network) ? networkFromJSON(object.network) : 0
+      network: isSet3(object.network) ? networkFromJSON(object.network) : 0,
+      statuses: globalThis.Array.isArray(object?.statuses) ? object.statuses.map((e) => transferStatusFromJSON(e)) : []
     };
   },
   toJSON(message) {
@@ -10092,6 +10493,9 @@ var TransferFilter = {
     if (message.network !== 0) {
       obj.network = networkToJSON(message.network);
     }
+    if (message.statuses?.length) {
+      obj.statuses = message.statuses.map((e) => transferStatusToJSON(e));
+    }
     return obj;
   },
   create(base) {
@@ -10133,6 +10537,7 @@ var TransferFilter = {
     message.offset = object.offset ?? 0;
     message.types = object.types?.map((e) => e) || [];
     message.network = object.network ?? 0;
+    message.statuses = object.statuses?.map((e) => e) || [];
     return message;
   }
 };
@@ -10431,189 +10836,53 @@ var ClaimTransferTweakKeysRequest = {
     return {
       transferId: isSet3(object.transferId) ? globalThis.String(object.transferId) : "",
       ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
-      leavesToReceive: globalThis.Array.isArray(object?.leavesToReceive) ? object.leavesToReceive.map((e) => ClaimLeafKeyTweak.fromJSON(e)) : []
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.transferId !== "") {
-      obj.transferId = message.transferId;
-    }
-    if (message.ownerIdentityPublicKey.length !== 0) {
-      obj.ownerIdentityPublicKey = base64FromBytes2(message.ownerIdentityPublicKey);
-    }
-    if (message.leavesToReceive?.length) {
-      obj.leavesToReceive = message.leavesToReceive.map((e) => ClaimLeafKeyTweak.toJSON(e));
-    }
-    return obj;
-  },
-  create(base) {
-    return ClaimTransferTweakKeysRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseClaimTransferTweakKeysRequest();
-    message.transferId = object.transferId ?? "";
-    message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
-    message.leavesToReceive = object.leavesToReceive?.map((e) => ClaimLeafKeyTweak.fromPartial(e)) || [];
-    return message;
-  }
-};
-function createBaseClaimTransferSignRefundsRequest() {
-  return { transferId: "", ownerIdentityPublicKey: new Uint8Array(0), signingJobs: [] };
-}
-var ClaimTransferSignRefundsRequest = {
-  encode(message, writer = new import_wire4.BinaryWriter()) {
-    if (message.transferId !== "") {
-      writer.uint32(10).string(message.transferId);
-    }
-    if (message.ownerIdentityPublicKey.length !== 0) {
-      writer.uint32(18).bytes(message.ownerIdentityPublicKey);
-    }
-    for (const v of message.signingJobs) {
-      LeafRefundTxSigningJob.encode(v, writer.uint32(26).fork()).join();
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire4.BinaryReader ? input : new import_wire4.BinaryReader(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseClaimTransferSignRefundsRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.transferId = reader.string();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.ownerIdentityPublicKey = reader.bytes();
-          continue;
-        }
-        case 3: {
-          if (tag !== 26) {
-            break;
-          }
-          message.signingJobs.push(LeafRefundTxSigningJob.decode(reader, reader.uint32()));
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      transferId: isSet3(object.transferId) ? globalThis.String(object.transferId) : "",
-      ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
-      signingJobs: globalThis.Array.isArray(object?.signingJobs) ? object.signingJobs.map((e) => LeafRefundTxSigningJob.fromJSON(e)) : []
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.transferId !== "") {
-      obj.transferId = message.transferId;
-    }
-    if (message.ownerIdentityPublicKey.length !== 0) {
-      obj.ownerIdentityPublicKey = base64FromBytes2(message.ownerIdentityPublicKey);
-    }
-    if (message.signingJobs?.length) {
-      obj.signingJobs = message.signingJobs.map((e) => LeafRefundTxSigningJob.toJSON(e));
-    }
-    return obj;
-  },
-  create(base) {
-    return ClaimTransferSignRefundsRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseClaimTransferSignRefundsRequest();
-    message.transferId = object.transferId ?? "";
-    message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
-    message.signingJobs = object.signingJobs?.map((e) => LeafRefundTxSigningJob.fromPartial(e)) || [];
-    return message;
-  }
-};
-function createBaseClaimTransferSignRefundsResponse() {
-  return { signingResults: [] };
-}
-var ClaimTransferSignRefundsResponse = {
-  encode(message, writer = new import_wire4.BinaryWriter()) {
-    for (const v of message.signingResults) {
-      LeafRefundTxSigningResult.encode(v, writer.uint32(10).fork()).join();
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire4.BinaryReader ? input : new import_wire4.BinaryReader(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseClaimTransferSignRefundsResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.signingResults.push(LeafRefundTxSigningResult.decode(reader, reader.uint32()));
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      signingResults: globalThis.Array.isArray(object?.signingResults) ? object.signingResults.map((e) => LeafRefundTxSigningResult.fromJSON(e)) : []
+      leavesToReceive: globalThis.Array.isArray(object?.leavesToReceive) ? object.leavesToReceive.map((e) => ClaimLeafKeyTweak.fromJSON(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
-    if (message.signingResults?.length) {
-      obj.signingResults = message.signingResults.map((e) => LeafRefundTxSigningResult.toJSON(e));
+    if (message.transferId !== "") {
+      obj.transferId = message.transferId;
+    }
+    if (message.ownerIdentityPublicKey.length !== 0) {
+      obj.ownerIdentityPublicKey = base64FromBytes2(message.ownerIdentityPublicKey);
+    }
+    if (message.leavesToReceive?.length) {
+      obj.leavesToReceive = message.leavesToReceive.map((e) => ClaimLeafKeyTweak.toJSON(e));
     }
     return obj;
   },
   create(base) {
-    return ClaimTransferSignRefundsResponse.fromPartial(base ?? {});
+    return ClaimTransferTweakKeysRequest.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseClaimTransferSignRefundsResponse();
-    message.signingResults = object.signingResults?.map((e) => LeafRefundTxSigningResult.fromPartial(e)) || [];
+    const message = createBaseClaimTransferTweakKeysRequest();
+    message.transferId = object.transferId ?? "";
+    message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
+    message.leavesToReceive = object.leavesToReceive?.map((e) => ClaimLeafKeyTweak.fromPartial(e)) || [];
     return message;
   }
 };
-function createBaseAggregateNodesRequest() {
-  return { nodeIds: [], signingJob: void 0, ownerIdentityPublicKey: new Uint8Array(0) };
+function createBaseClaimTransferSignRefundsRequest() {
+  return { transferId: "", ownerIdentityPublicKey: new Uint8Array(0), signingJobs: [] };
 }
-var AggregateNodesRequest = {
+var ClaimTransferSignRefundsRequest = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
-    for (const v of message.nodeIds) {
-      writer.uint32(10).string(v);
-    }
-    if (message.signingJob !== void 0) {
-      SigningJob.encode(message.signingJob, writer.uint32(18).fork()).join();
+    if (message.transferId !== "") {
+      writer.uint32(10).string(message.transferId);
     }
     if (message.ownerIdentityPublicKey.length !== 0) {
-      writer.uint32(26).bytes(message.ownerIdentityPublicKey);
+      writer.uint32(18).bytes(message.ownerIdentityPublicKey);
+    }
+    for (const v of message.signingJobs) {
+      LeafRefundTxSigningJob.encode(v, writer.uint32(26).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
     const reader = input instanceof import_wire4.BinaryReader ? input : new import_wire4.BinaryReader(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseAggregateNodesRequest();
+    const message = createBaseClaimTransferSignRefundsRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -10621,21 +10890,21 @@ var AggregateNodesRequest = {
           if (tag !== 10) {
             break;
           }
-          message.nodeIds.push(reader.string());
+          message.transferId = reader.string();
           continue;
         }
         case 2: {
           if (tag !== 18) {
             break;
           }
-          message.signingJob = SigningJob.decode(reader, reader.uint32());
+          message.ownerIdentityPublicKey = reader.bytes();
           continue;
         }
         case 3: {
           if (tag !== 26) {
             break;
           }
-          message.ownerIdentityPublicKey = reader.bytes();
+          message.signingJobs.push(LeafRefundTxSigningJob.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -10648,63 +10917,49 @@ var AggregateNodesRequest = {
   },
   fromJSON(object) {
     return {
-      nodeIds: globalThis.Array.isArray(object?.nodeIds) ? object.nodeIds.map((e) => globalThis.String(e)) : [],
-      signingJob: isSet3(object.signingJob) ? SigningJob.fromJSON(object.signingJob) : void 0,
-      ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0)
+      transferId: isSet3(object.transferId) ? globalThis.String(object.transferId) : "",
+      ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
+      signingJobs: globalThis.Array.isArray(object?.signingJobs) ? object.signingJobs.map((e) => LeafRefundTxSigningJob.fromJSON(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
-    if (message.nodeIds?.length) {
-      obj.nodeIds = message.nodeIds;
-    }
-    if (message.signingJob !== void 0) {
-      obj.signingJob = SigningJob.toJSON(message.signingJob);
+    if (message.transferId !== "") {
+      obj.transferId = message.transferId;
     }
     if (message.ownerIdentityPublicKey.length !== 0) {
       obj.ownerIdentityPublicKey = base64FromBytes2(message.ownerIdentityPublicKey);
     }
+    if (message.signingJobs?.length) {
+      obj.signingJobs = message.signingJobs.map((e) => LeafRefundTxSigningJob.toJSON(e));
+    }
     return obj;
   },
   create(base) {
-    return AggregateNodesRequest.fromPartial(base ?? {});
+    return ClaimTransferSignRefundsRequest.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseAggregateNodesRequest();
-    message.nodeIds = object.nodeIds?.map((e) => e) || [];
-    message.signingJob = object.signingJob !== void 0 && object.signingJob !== null ? SigningJob.fromPartial(object.signingJob) : void 0;
+    const message = createBaseClaimTransferSignRefundsRequest();
+    message.transferId = object.transferId ?? "";
     message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
+    message.signingJobs = object.signingJobs?.map((e) => LeafRefundTxSigningJob.fromPartial(e)) || [];
     return message;
   }
 };
-function createBaseAggregateNodesResponse() {
-  return {
-    aggregateSignature: void 0,
-    verifyingKey: new Uint8Array(0),
-    parentNodeTx: new Uint8Array(0),
-    parentNodeVout: 0
-  };
+function createBaseClaimTransferSignRefundsResponse() {
+  return { signingResults: [] };
 }
-var AggregateNodesResponse = {
+var ClaimTransferSignRefundsResponse = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
-    if (message.aggregateSignature !== void 0) {
-      SigningResult.encode(message.aggregateSignature, writer.uint32(10).fork()).join();
-    }
-    if (message.verifyingKey.length !== 0) {
-      writer.uint32(18).bytes(message.verifyingKey);
-    }
-    if (message.parentNodeTx.length !== 0) {
-      writer.uint32(26).bytes(message.parentNodeTx);
-    }
-    if (message.parentNodeVout !== 0) {
-      writer.uint32(32).uint32(message.parentNodeVout);
+    for (const v of message.signingResults) {
+      LeafRefundTxSigningResult.encode(v, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
     const reader = input instanceof import_wire4.BinaryReader ? input : new import_wire4.BinaryReader(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseAggregateNodesResponse();
+    const message = createBaseClaimTransferSignRefundsResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -10712,28 +10967,7 @@ var AggregateNodesResponse = {
           if (tag !== 10) {
             break;
           }
-          message.aggregateSignature = SigningResult.decode(reader, reader.uint32());
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.verifyingKey = reader.bytes();
-          continue;
-        }
-        case 3: {
-          if (tag !== 26) {
-            break;
-          }
-          message.parentNodeTx = reader.bytes();
-          continue;
-        }
-        case 4: {
-          if (tag !== 32) {
-            break;
-          }
-          message.parentNodeVout = reader.uint32();
+          message.signingResults.push(LeafRefundTxSigningResult.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -10746,37 +10980,22 @@ var AggregateNodesResponse = {
   },
   fromJSON(object) {
     return {
-      aggregateSignature: isSet3(object.aggregateSignature) ? SigningResult.fromJSON(object.aggregateSignature) : void 0,
-      verifyingKey: isSet3(object.verifyingKey) ? bytesFromBase642(object.verifyingKey) : new Uint8Array(0),
-      parentNodeTx: isSet3(object.parentNodeTx) ? bytesFromBase642(object.parentNodeTx) : new Uint8Array(0),
-      parentNodeVout: isSet3(object.parentNodeVout) ? globalThis.Number(object.parentNodeVout) : 0
+      signingResults: globalThis.Array.isArray(object?.signingResults) ? object.signingResults.map((e) => LeafRefundTxSigningResult.fromJSON(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
-    if (message.aggregateSignature !== void 0) {
-      obj.aggregateSignature = SigningResult.toJSON(message.aggregateSignature);
-    }
-    if (message.verifyingKey.length !== 0) {
-      obj.verifyingKey = base64FromBytes2(message.verifyingKey);
-    }
-    if (message.parentNodeTx.length !== 0) {
-      obj.parentNodeTx = base64FromBytes2(message.parentNodeTx);
-    }
-    if (message.parentNodeVout !== 0) {
-      obj.parentNodeVout = Math.round(message.parentNodeVout);
+    if (message.signingResults?.length) {
+      obj.signingResults = message.signingResults.map((e) => LeafRefundTxSigningResult.toJSON(e));
     }
     return obj;
   },
   create(base) {
-    return AggregateNodesResponse.fromPartial(base ?? {});
+    return ClaimTransferSignRefundsResponse.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseAggregateNodesResponse();
-    message.aggregateSignature = object.aggregateSignature !== void 0 && object.aggregateSignature !== null ? SigningResult.fromPartial(object.aggregateSignature) : void 0;
-    message.verifyingKey = object.verifyingKey ?? new Uint8Array(0);
-    message.parentNodeTx = object.parentNodeTx ?? new Uint8Array(0);
-    message.parentNodeVout = object.parentNodeVout ?? 0;
+    const message = createBaseClaimTransferSignRefundsResponse();
+    message.signingResults = object.signingResults?.map((e) => LeafRefundTxSigningResult.fromPartial(e)) || [];
     return message;
   }
 };
@@ -14180,7 +14399,7 @@ var CancelTransferResponse = {
   }
 };
 function createBaseQueryUnusedDepositAddressesRequest() {
-  return { identityPublicKey: new Uint8Array(0), network: 0 };
+  return { identityPublicKey: new Uint8Array(0), network: 0, limit: 0, offset: 0 };
 }
 var QueryUnusedDepositAddressesRequest = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
@@ -14190,6 +14409,12 @@ var QueryUnusedDepositAddressesRequest = {
     if (message.network !== 0) {
       writer.uint32(16).int32(message.network);
     }
+    if (message.limit !== 0) {
+      writer.uint32(24).int64(message.limit);
+    }
+    if (message.offset !== 0) {
+      writer.uint32(32).int64(message.offset);
+    }
     return writer;
   },
   decode(input, length) {
@@ -14213,6 +14438,20 @@ var QueryUnusedDepositAddressesRequest = {
           message.network = reader.int32();
           continue;
         }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+          message.limit = longToNumber2(reader.int64());
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+          message.offset = longToNumber2(reader.int64());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -14224,7 +14463,9 @@ var QueryUnusedDepositAddressesRequest = {
   fromJSON(object) {
     return {
       identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0),
-      network: isSet3(object.network) ? networkFromJSON(object.network) : 0
+      network: isSet3(object.network) ? networkFromJSON(object.network) : 0,
+      limit: isSet3(object.limit) ? globalThis.Number(object.limit) : 0,
+      offset: isSet3(object.offset) ? globalThis.Number(object.offset) : 0
     };
   },
   toJSON(message) {
@@ -14235,6 +14476,12 @@ var QueryUnusedDepositAddressesRequest = {
     if (message.network !== 0) {
       obj.network = networkToJSON(message.network);
     }
+    if (message.limit !== 0) {
+      obj.limit = Math.round(message.limit);
+    }
+    if (message.offset !== 0) {
+      obj.offset = Math.round(message.offset);
+    }
     return obj;
   },
   create(base) {
@@ -14244,6 +14491,8 @@ var QueryUnusedDepositAddressesRequest = {
     const message = createBaseQueryUnusedDepositAddressesRequest();
     message.identityPublicKey = object.identityPublicKey ?? new Uint8Array(0);
     message.network = object.network ?? 0;
+    message.limit = object.limit ?? 0;
+    message.offset = object.offset ?? 0;
     return message;
   }
 };
@@ -14449,13 +14698,16 @@ var DepositAddressQueryResult = {
   }
 };
 function createBaseQueryUnusedDepositAddressesResponse() {
-  return { depositAddresses: [] };
+  return { depositAddresses: [], offset: 0 };
 }
 var QueryUnusedDepositAddressesResponse = {
   encode(message, writer = new import_wire4.BinaryWriter()) {
     for (const v of message.depositAddresses) {
       DepositAddressQueryResult.encode(v, writer.uint32(10).fork()).join();
     }
+    if (message.offset !== 0) {
+      writer.uint32(16).int64(message.offset);
+    }
     return writer;
   },
   decode(input, length) {
@@ -14472,6 +14724,13 @@ var QueryUnusedDepositAddressesResponse = {
           message.depositAddresses.push(DepositAddressQueryResult.decode(reader, reader.uint32()));
           continue;
         }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+          message.offset = longToNumber2(reader.int64());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -14482,7 +14741,8 @@ var QueryUnusedDepositAddressesResponse = {
   },
   fromJSON(object) {
     return {
-      depositAddresses: globalThis.Array.isArray(object?.depositAddresses) ? object.depositAddresses.map((e) => DepositAddressQueryResult.fromJSON(e)) : []
+      depositAddresses: globalThis.Array.isArray(object?.depositAddresses) ? object.depositAddresses.map((e) => DepositAddressQueryResult.fromJSON(e)) : [],
+      offset: isSet3(object.offset) ? globalThis.Number(object.offset) : 0
     };
   },
   toJSON(message) {
@@ -14490,6 +14750,9 @@ var QueryUnusedDepositAddressesResponse = {
     if (message.depositAddresses?.length) {
       obj.depositAddresses = message.depositAddresses.map((e) => DepositAddressQueryResult.toJSON(e));
     }
+    if (message.offset !== 0) {
+      obj.offset = Math.round(message.offset);
+    }
     return obj;
   },
   create(base) {
@@ -14498,6 +14761,7 @@ var QueryUnusedDepositAddressesResponse = {
   fromPartial(object) {
     const message = createBaseQueryUnusedDepositAddressesResponse();
     message.depositAddresses = object.depositAddresses?.map((e) => DepositAddressQueryResult.fromPartial(e)) || [];
+    message.offset = object.offset ?? 0;
     return message;
   }
 };
@@ -16084,6 +16348,11 @@ var SparkServiceDefinition = {
       responseStream: false,
       options: {}
     },
+    /**
+     * This is deprecated, please use finalize_transfer_with_transfer_package instead.
+     *
+     * @deprecated
+     */
     finalize_transfer: {
       name: "finalize_transfer",
       requestType: FinalizeTransferRequest,
@@ -16140,14 +16409,6 @@ var SparkServiceDefinition = {
       responseStream: false,
       options: {}
     },
-    aggregate_nodes: {
-      name: "aggregate_nodes",
-      requestType: AggregateNodesRequest,
-      requestStream: false,
-      responseType: AggregateNodesResponse,
-      responseStream: false,
-      options: {}
-    },
     store_preimage_share: {
       name: "store_preimage_share",
       requestType: StorePreimageShareRequest,
@@ -16481,9 +16742,12 @@ init_buffer();
 var import_core10 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.1.43" : "unknown";
+var packageVersion = true ? "0.1.44" : "unknown";
 var baseEnvStr = "unknown";
-if (import_core10.isNode) {
+if (isBun) {
+  const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
+  baseEnvStr = `bun/${bunVersion}`;
+} else if (import_core10.isNode) {
   baseEnvStr = `node/${process.version}`;
 } else if (isReactNative) {
   baseEnvStr = "react-native";
@@ -17751,7 +18015,8 @@ var BASE_CONFIG = {
   }
 };
 var LOCAL_WALLET_CONFIG = {
-  ...BASE_CONFIG
+  ...BASE_CONFIG,
+  threshold: 3
 };
 var LOCAL_WALLET_CONFIG_SCHNORR = {
   ...LOCAL_WALLET_CONFIG,
@@ -20328,8 +20593,8 @@ function getNextTransactionSequence(currSequence, forRefresh) {
       needRefresh: true
     };
   }
-  if (nextTimelock < 100) {
-    throw new ValidationError("timelock interval is less than 100", {
+  if (nextTimelock < 0) {
+    throw new ValidationError("timelock interval is less than 0", {
       field: "nextTimelock",
       value: nextTimelock
     });
@@ -26267,17 +26532,30 @@ function hashTokenTransactionV1(tokenTransaction, partialHash = false) {
   );
   hashObj.update(networkBytes);
   allHashes.push(hashObj.digest());
-  const expiryHashObj = import_sha211.sha256.create();
-  const validityDurationBytes = new Uint8Array(8);
-  const expiryUnixTime = tokenTransaction.expiryTime ? Math.floor(tokenTransaction.expiryTime.getTime() / 1e3) : 0;
-  new DataView(validityDurationBytes.buffer).setBigUint64(
+  const clientTimestampHashObj = import_sha211.sha256.create();
+  const clientCreatedTs = tokenTransaction.clientCreatedTimestamp;
+  const clientUnixTime = clientCreatedTs ? Math.floor(clientCreatedTs.getTime() / 1e3) : 0;
+  const clientTimestampBytes = new Uint8Array(8);
+  new DataView(clientTimestampBytes.buffer).setBigUint64(
     0,
-    BigInt(expiryUnixTime),
+    BigInt(clientUnixTime),
     false
-    // false for big-endian
   );
-  expiryHashObj.update(validityDurationBytes);
-  allHashes.push(expiryHashObj.digest());
+  clientTimestampHashObj.update(clientTimestampBytes);
+  allHashes.push(clientTimestampHashObj.digest());
+  if (!partialHash) {
+    const expiryHashObj = import_sha211.sha256.create();
+    const expiryTimeBytes = new Uint8Array(8);
+    const expiryUnixTime = tokenTransaction.expiryTime ? Math.floor(tokenTransaction.expiryTime.getTime() / 1e3) : 0;
+    new DataView(expiryTimeBytes.buffer).setBigUint64(
+      0,
+      BigInt(expiryUnixTime),
+      false
+      // false for big-endian
+    );
+    expiryHashObj.update(expiryTimeBytes);
+    allHashes.push(expiryHashObj.digest());
+  }
   const finalHashObj = import_sha211.sha256.create();
   const concatenatedHashes = new Uint8Array(
     allHashes.reduce((sum, hash) => sum + hash.length, 0)
@@ -26870,6 +27148,9 @@ var TokenTransactionService = class {
     return txId;
   }
   async constructTransferTokenTransactionV0(selectedOutputs, tokenOutputData) {
+    selectedOutputs.sort(
+      (a, b) => a.previousTransactionVout - b.previousTransactionVout
+    );
     const availableTokenAmount = calculateAvailableTokenAmount(selectedOutputs);
     const totalRequestedAmount = tokenOutputData.reduce(
       (sum, output) => sum + output.tokenAmount,
@@ -26905,6 +27186,9 @@ var TokenTransactionService = class {
     };
   }
   async constructTransferTokenTransaction(selectedOutputs, tokenOutputData) {
+    selectedOutputs.sort(
+      (a, b) => a.previousTransactionVout - b.previousTransactionVout
+    );
     const availableTokenAmount = calculateAvailableTokenAmount(selectedOutputs);
     const totalRequestedAmount = tokenOutputData.reduce(
       (sum, output) => sum + output.tokenAmount,
@@ -27371,6 +27655,7 @@ var TokenTransactionService = class {
       await coordinatorClient.commit_transaction(
         {
           finalTokenTransaction,
+          finalTokenTransactionHash,
           inputTtxoSignaturesPerOperator,
           ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey()
         },
@@ -27608,7 +27893,7 @@ var import_utils18 = require("@noble/curves/abstract/utils");
 var import_sha212 = require("@noble/hashes/sha2");
 var import_btc_signer5 = require("@scure/btc-signer");
 var INITIAL_TIME_LOCK3 = 2e3;
-function maybeApplyFee3(amount) {
+function maybeApplyFee2(amount) {
   if (amount > BigInt(DEFAULT_FEE_SATS)) {
     return amount - BigInt(DEFAULT_FEE_SATS);
   }
@@ -27877,7 +28162,7 @@ var TreeCreationService = class {
     const refundPkScript = import_btc_signer5.OutScript.encode(refundAddress);
     refundTx.addOutput({
       script: refundPkScript,
-      amount: maybeApplyFee3(parentTxOut.amount)
+      amount: maybeApplyFee2(parentTxOut.amount)
     });
     refundTx.addOutput(getEphemeralAnchorOutput());
     const refundSigningNonceCommitment = await this.config.signer.getRandomSigningCommitment();
@@ -28793,13 +29078,34 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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", {
@@ -28807,33 +29113,49 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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) {
@@ -29066,27 +29388,44 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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 {
@@ -29096,15 +29435,15 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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,
@@ -29168,8 +29507,9 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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: (0, import_uuidv75.uuidv7)()
@@ -29225,11 +29565,21 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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}`);
@@ -29766,13 +30116,45 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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.
@@ -29821,14 +30203,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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;
@@ -29882,14 +30261,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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 = [];
@@ -29993,7 +30369,9 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       (0, import_utils23.hexToBytes)(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(
@@ -30236,7 +30614,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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(
@@ -30495,7 +30873,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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(
@@ -30605,13 +30983,18 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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", {
@@ -30621,7 +31004,13 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
     }
     return await this.withLeaves(async () => {
-      return await this.coopExit(onchainAddress, exitSpeed, amountSats);
+      return await this.coopExit(
+        onchainAddress,
+        feeQuote,
+        exitSpeed,
+        deductFeeFromWithdrawalAmount,
+        amountSats
+      );
     });
   }
   /**
@@ -30632,7 +31021,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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",
@@ -30640,41 +31029,34 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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,
@@ -30682,11 +31064,32 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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(
           (0, import_sha213.sha256)(leaf.id)
@@ -30694,13 +31097,23 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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: (0, import_uuidv75.uuidv7)(),
       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");
     }
@@ -30738,9 +31151,9 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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
   }) {
@@ -30752,10 +31165,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.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
     });