@buildonspark/spark-sdk 0.1.43 → 0.1.45

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

@@ -1,12 +1,9 @@
-import {
-  ConnectionManager
-} from "./chunk-HRQRRDSS.js";
 import {
   Lrc20ConnectionManager
-} from "./chunk-GYQR4B4P.js";
+} from "./chunk-GZ5IPPJ2.js";
 import {
   TokenTransactionService
-} from "./chunk-DQYKQJRZ.js";
+} from "./chunk-C2S227QR.js";
 import {
   DEFAULT_FEE_SATS,
   computeTaprootKeyNoScript,
@@ -23,16 +20,17 @@ import {
   getTxFromRawTxHex,
   getTxId,
   proofOfPossessionMessageHashForDepositAddress
-} from "./chunk-IRW5TWMH.js";
+} from "./chunk-5FUB65LX.js";
 import {
   calculateAvailableTokenAmount
-} from "./chunk-6AFUC5M2.js";
+} from "./chunk-HWJWKEIU.js";
 import {
   mapTransferToWalletTransfer,
   mapTreeNodeToWalletLeaf
-} from "./chunk-MIVX3GHD.js";
+} from "./chunk-OBFKIEMP.js";
 import {
   ClaimStaticDepositRequestType_default,
+  CoopExitFeeQuoteFromJson,
   CurrencyAmountFromJson,
   ExitSpeed_default,
   FRAGMENT,
@@ -40,20 +38,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-KMUMFYFX.js";
 import {
   WalletConfigService
-} from "./chunk-BUTZWYBW.js";
+} from "./chunk-6264CGDM.js";
 import {
   LRC_WALLET_NETWORK,
   LRC_WALLET_NETWORK_TYPE,
@@ -63,17 +62,7 @@ import {
 } from "./chunk-Z5HIAYFT.js";
 import {
   ELECTRS_CREDENTIALS
-} from "./chunk-DOA6QXYQ.js";
-import {
-  BitcoinNetwork_default
-} from "./chunk-HMLOC6TE.js";
-import {
-  SendLeafKeyTweaks,
-  networkToJSON
-} from "./chunk-M6A4KFIG.js";
-import {
-  isReactNative
-} from "./chunk-VFJQNBFX.js";
+} from "./chunk-R5PXJZQS.js";
 import {
   addPublicKeys,
   applyAdaptorToSignature,
@@ -84,6 +73,15 @@ import {
 import {
   getCrypto
 } from "./chunk-QNNSEJ4P.js";
+import {
+  BitcoinNetwork_default
+} from "./chunk-HMLOC6TE.js";
+import {
+  ConnectionManager
+} from "./chunk-PQN3C2MF.js";
+import {
+  isReactNative
+} from "./chunk-7V6N75CC.js";
 import {
   AuthenticationError,
   ConfigurationError,
@@ -91,6 +89,10 @@ import {
   RPCError,
   ValidationError
 } from "./chunk-GSI4OLXZ.js";
+import {
+  SendLeafKeyTweaks,
+  networkToJSON
+} from "./chunk-BGGEVUJK.js";
 import {
   Buffer
 } from "./chunk-MVRQ5US7.js";
@@ -104,7 +106,7 @@ import {
   hexToBytes as hexToBytes7,
   numberToVarBytesBE
 } from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k16 } from "@noble/curves/secp256k1";
+import { secp256k1 as secp256k15 } from "@noble/curves/secp256k1";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
 import { Address as Address4, OutScript as OutScript4, Transaction as Transaction6 } from "@scure/btc-signer";
@@ -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;
@@ -1263,7 +1316,10 @@ var BaseTransferService = class {
     const transferPackage = {
       leavesToSend: leafSigningJobs,
       keyTweakPackage: encryptedKeyTweaks,
-      userSignature: new Uint8Array()
+      userSignature: new Uint8Array(),
+      // TODO: Add direct refund signature
+      directLeavesToSend: [],
+      directFromCpfpLeavesToSend: []
     };
     const transferPackageSigningPayload = getTransferPackageSigningPayload(
       transferID,
@@ -1362,7 +1418,11 @@ var BaseTransferService = class {
       nodeSignatures.push({
         nodeId: operatorSigningResult.leafId,
         refundTxSignature: refundAggregate,
-        nodeTxSignature: new Uint8Array()
+        nodeTxSignature: new Uint8Array(),
+        // TODO: Add direct refund signature
+        directNodeTxSignature: new Uint8Array(),
+        directRefundTxSignature: new Uint8Array(),
+        directFromCpfpRefundTxSignature: new Uint8Array()
       });
     }
     return nodeSignatures;
@@ -1444,7 +1504,10 @@ var BaseTransferService = class {
         pubkeySharesTweak: Object.fromEntries(pubkeySharesTweak),
         secretCipher,
         signature,
-        refundSignature: refundSignature ?? new Uint8Array()
+        refundSignature: refundSignature ?? new Uint8Array(),
+        // TODO: Add direct refund signature
+        directRefundSignature: new Uint8Array(),
+        directFromCpfpRefundSignature: new Uint8Array()
       });
     }
     return leafTweaksMap;
@@ -1726,7 +1789,11 @@ var TransferService = class extends BaseTransferService {
           signingPublicKey: refundSigningData.signingPubKey,
           rawTx: refundTx.toBytes(),
           signingNonceCommitment: refundNonceCommitmentProto
-        }
+        },
+        // TODO: Add direct refund signature
+        directRefundTxSigningJob: void 0,
+        // TODO: Add direct refund signature
+        directFromCpfpRefundTxSigningJob: void 0
       });
     }
     return signingJobs;
@@ -2093,7 +2160,11 @@ var TransferService = class extends BaseTransferService {
         nodeSignatures.push({
           nodeId,
           nodeTxSignature: signature,
-          refundTxSignature: new Uint8Array()
+          refundTxSignature: new Uint8Array(),
+          // TODO: Add direct refund signature
+          directNodeTxSignature: new Uint8Array(),
+          directRefundTxSignature: new Uint8Array(),
+          directFromCpfpRefundTxSignature: new Uint8Array()
         });
       } else if (i === nodes.length) {
         refundSignature = signature;
@@ -2108,7 +2179,11 @@ var TransferService = class extends BaseTransferService {
     nodeSignatures.push({
       nodeId: leafNodeId,
       nodeTxSignature: leafSignature,
-      refundTxSignature: refundSignature
+      refundTxSignature: refundSignature,
+      // TODO: Add direct refund signature
+      directNodeTxSignature: new Uint8Array(),
+      directRefundTxSignature: new Uint8Array(),
+      directFromCpfpRefundTxSignature: new Uint8Array()
     });
     const result = await sparkClient.finalize_node_signatures({
       intent: 3 /* REFRESH */,
@@ -2425,7 +2500,10 @@ var CoopExitService = class extends BaseTransferService {
           signingPublicKey: leaf.signingPubKey,
           rawTx: refundTx.toBytes(),
           signingNonceCommitment
-        }
+        },
+        // TODO: Add direct refund signature
+        directRefundTxSigningJob: void 0,
+        directFromCpfpRefundTxSigningJob: void 0
       };
       signingJobs.push(signingJob);
       const tx = getTxFromRawTxBytes(leaf.leaf.nodeTx);
@@ -2798,98 +2876,58 @@ import {
   hexToBytes as hexToBytes3,
   numberToBytesBE as numberToBytesBE2
 } from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
-import { sha256 as sha2565 } from "@noble/hashes/sha2";
+import { secp256k1 as secp256k13 } from "@noble/curves/secp256k1";
+import { sha256 as sha2564 } from "@noble/hashes/sha2";
 import { uuidv7 as uuidv73 } from "uuidv7";
 
 // src/services/bolt11-spark.ts
-import { bech32 } from "@scure/base";
-import { sha256 as sha2564 } from "@noble/hashes/sha2";
-import { secp256k1 as secp256k13 } from "@noble/curves/secp256k1";
+import { decode } from "light-bolt11-decoder";
+var RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID = "f42400f424000001";
+var PAYMENT_HASH_NAME = "payment_hash";
+var AMOUNT_MSATS_NAME = "amount";
+var PAYMENT_SECRET_NAME = "payment_secret";
 function decodeInvoice(invoice) {
-  const { words, prefix } = bech32.decode(
-    invoice,
-    1e3
-  );
-  verifySignature(words, prefix);
-  const amountMSats = extractMillisatoshiAmountFromInvoice(invoice);
-  let fallbackAddress = void 0;
-  let paymentHash = void 0;
-  let paymentSecret = void 0;
-  let i = 7;
-  const tlvEnd = words.length - 105;
-  while (i + 2 < tlvEnd) {
-    const tag = words[i];
-    const len1 = words[i + 1];
-    const len2 = words[i + 2];
-    if (len1 === void 0 || len2 === void 0) {
-      console.log("No length word");
-      break;
-    }
-    const len = (len1 << 5) + len2;
-    const start = i + 3;
-    const end = start + len;
-    if (tag === 1) {
-      const hashWords = words.slice(start, end);
-      const hashBytes = bech32WordsToBytes(hashWords);
-      if (hashBytes.length === 32) {
-        paymentHash = Buffer.from(hashBytes).toString("hex");
-      }
-    } else if (tag === 9) {
-      const verWord = words[start];
-      if (verWord !== 31) {
-        console.warn("Not our custom version-31");
-        i = end;
-        continue;
-      }
-      const payloadWords = words.slice(start + 1, end);
-      const payloadBytes = bech32WordsToBytes(payloadWords);
-      fallbackAddress = Buffer.from(payloadBytes).toString("hex");
-    } else if (tag === 16) {
-      if (len !== 52) {
-        throw new ValidationError("Invalid payment secret length", {
-          field: "paymentSecret",
-          value: len,
-          expected: "52 words (32 bytes for 256-bit secret)"
-        });
-      }
-      const secretWords = words.slice(start, end);
-      const secretBytes = bech32WordsToBytes(secretWords);
-      if (secretBytes.length !== 32) {
-        throw new ValidationError("Invalid payment secret size", {
-          field: "paymentSecret",
-          value: secretBytes.length,
-          expected: "32 bytes (256 bits)"
-        });
+  const decodedInvoice = decode(invoice);
+  const network = getNetworkFromInvoice(invoice);
+  if (network === null) {
+    throw new ValidationError("Invalid network found in invoice: " + invoice);
+  }
+  let paymentSection;
+  let routeHints = [];
+  let amountSection;
+  let paymentSecretSection;
+  let fallbackAddress;
+  for (const section of decodedInvoice.sections) {
+    if (section.name === PAYMENT_HASH_NAME) {
+      paymentSection = section;
+    }
+    if (section.name === AMOUNT_MSATS_NAME) {
+      amountSection = section;
+    }
+    if (section.name === PAYMENT_SECRET_NAME) {
+      paymentSecretSection = section;
+    }
+  }
+  routeHints = decodedInvoice.route_hints;
+  const amountMSats = amountSection?.value ? BigInt(amountSection.value) : null;
+  const paymentHash = paymentSection?.value;
+  for (const routeHintArray of routeHints) {
+    for (const routeHint of routeHintArray) {
+      if (routeHint.short_channel_id === RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID) {
+        fallbackAddress = routeHint.pubkey;
       }
-      paymentSecret = Buffer.from(secretBytes).toString("hex");
     }
-    i = end;
   }
   if (paymentHash === void 0) {
     throw new ValidationError("No payment hash found in invoice: " + invoice);
   }
-  if (paymentSecret === void 0) {
+  if (paymentSecretSection?.value === void 0) {
     throw new ValidationError(
       "Invalid payment secret found in invoice: " + invoice
     );
   }
   return { amountMSats, fallbackAddress, paymentHash };
 }
-function bech32WordsToBytes(words) {
-  let acc = 0, bits = 0;
-  const out = [];
-  for (const w of words) {
-    if (w < 0 || w > 31) throw new Error(`bad word ${w}`);
-    acc = acc << 5 | w;
-    bits += 5;
-    while (bits >= 8) {
-      bits -= 8;
-      out.push(acc >> bits & 255);
-    }
-  }
-  return new Uint8Array(out);
-}
 function getNetworkFromInvoice(invoice) {
   if (invoice.startsWith("lnbcrt")) return 3 /* REGTEST */;
   if (invoice.startsWith("lnbc")) return 0 /* MAINNET */;
@@ -2897,85 +2935,11 @@ function getNetworkFromInvoice(invoice) {
   if (invoice.startsWith("lnsb")) return 2 /* SIGNET */;
   return null;
 }
-function extractMillisatoshiAmountFromInvoice(invoice) {
-  const match = invoice.match(/^ln[a-z]+(\d+)([a-z]?)1/);
-  if (!match) return null;
-  const [, amount, multiplier] = match;
-  if (!amount) return null;
-  const value = BigInt(amount);
-  const MILLISATS_PER_BTC = 100000000000n;
-  const divisors = {
-    m: 1000n,
-    u: 1000000n,
-    n: 1000000000n,
-    p: 10000000000000n
-  };
-  if (multiplier) {
-    if (!(multiplier in divisors)) {
-      throw new ValidationError(`Invalid multiplier: ${multiplier}`, {
-        field: "multiplier",
-        value: multiplier,
-        expected: "valid bolt11 multiplier: m, u, n, p"
-      });
-    }
-    const divisor = divisors[multiplier];
-    if (value * MILLISATS_PER_BTC % divisor !== 0n) {
-      throw new ValidationError("Invalid submillisatoshi precision", {
-        field: "amount",
-        value: `${amount}${multiplier}`,
-        expected: "amount must result in whole millisatoshis"
-      });
-    }
-    return value * MILLISATS_PER_BTC / divisor;
-  } else {
-    return value * MILLISATS_PER_BTC;
-  }
-}
-function hasSparkHeader(bytes) {
-  if (bytes.length < 3) {
-    return false;
-  }
-  return bytes[0] === 83 && // 'S'
-  bytes[1] === 80 && // 'P'
-  bytes[2] === 75;
-}
 function isValidSparkFallback(bytes) {
-  if (bytes.length !== 36) {
+  if (bytes.length !== 33) {
     return false;
   }
-  return hasSparkHeader(bytes);
-}
-function verifySignature(words, prefix) {
-  if (words.length < 104) {
-    throw new ValidationError("Invoice too short for signature");
-  }
-  const signatureStart = words.length - 104;
-  const signatureEnd = words.length - 1;
-  const hrp = prefix;
-  const hrpBytes = new TextEncoder().encode(hrp);
-  const dataWords = words.slice(0, signatureStart);
-  const dataBytes = bech32WordsToBytes(dataWords);
-  const sigWords = words.slice(signatureStart, signatureEnd);
-  const sigBytes = bech32WordsToBytes(sigWords);
-  if (sigBytes.length !== 64) {
-    throw new ValidationError("Invalid signature length");
-  }
-  const recoveryId = words[words.length - 1];
-  if (recoveryId === void 0) {
-    throw new ValidationError("Missing recovery ID in signature");
-  }
-  const messageBytes = new Uint8Array(hrpBytes.length + dataBytes.length);
-  messageBytes.set(hrpBytes, 0);
-  messageBytes.set(dataBytes, hrpBytes.length);
-  const messageHash = sha2564(messageBytes);
-  try {
-    const signature = secp256k13.Signature.fromCompact(sigBytes).addRecoveryBit(recoveryId);
-    signature.recoverPublicKey(messageHash);
-  } catch (error) {
-    throw new ValidationError(
-      `Invalid BOLT11 signature: ${error.message}`
-    );
-  }
+  return true;
 }
 
 // src/services/lightning.ts
@@ -2998,7 +2962,7 @@ var LightningService = class {
   }) {
     const randBytes = crypto.getRandomValues(new Uint8Array(32));
     const preimage = numberToBytesBE2(
-      bytesToNumberBE(randBytes) % secp256k14.CURVE.n,
+      bytesToNumberBE(randBytes) % secp256k13.CURVE.n,
       32
     );
     return await this.createLightningInvoiceWithPreImage({
@@ -3018,7 +2982,7 @@ var LightningService = class {
     receiverIdentityPubkey,
     descriptionHash
   }) {
-    const paymentHash = sha2565(preimage);
+    const paymentHash = sha2564(preimage);
     const invoice = await invoiceCreator(
       amountSats,
       paymentHash,
@@ -3035,7 +2999,7 @@ var LightningService = class {
     }
     const shares = await this.config.signer.splitSecretWithProofs({
       secret: preimage,
-      curveOrder: secp256k14.CURVE.n,
+      curveOrder: secp256k13.CURVE.n,
       threshold: this.config.getThreshold(),
       numShares: Object.keys(this.config.getSigningOperators()).length
     });
@@ -3215,7 +3179,7 @@ var LightningService = class {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
-    const paymentHash = sha2565(preimage);
+    const paymentHash = sha2564(preimage);
     let response;
     try {
       response = await sparkClient.provide_preimage({
@@ -3247,10 +3211,10 @@ var LightningService = class {
 
 // src/services/tree-creation.ts
 import { hexToBytes as hexToBytes4 } from "@noble/curves/abstract/utils";
-import { sha256 as sha2566 } from "@noble/hashes/sha2";
+import { sha256 as sha2565 } 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);
   }
@@ -3403,7 +3367,7 @@ var TreeCreationService = class {
     return finalizeResp;
   }
   async createDepositAddressTree(targetSigningPublicKey, nodeId) {
-    const leftKey = await this.config.signer.generatePublicKey(sha2566(nodeId));
+    const leftKey = await this.config.signer.generatePublicKey(sha2565(nodeId));
     const leftNode = {
       signingPublicKey: leftKey,
       children: []
@@ -3452,7 +3416,10 @@ var TreeCreationService = class {
     const internalCreationNode = {
       nodeTxSigningJob: void 0,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     const tx = new Transaction4({ version: 3 });
     tx.addInput({
@@ -3481,7 +3448,10 @@ var TreeCreationService = class {
     const childCreationNode = {
       nodeTxSigningJob: void 0,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     const childTx = new Transaction4({ version: 3 });
     childTx.addInput({
@@ -3519,7 +3489,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();
@@ -3566,7 +3536,10 @@ var TreeCreationService = class {
     const rootCreationNode = {
       nodeTxSigningJob: rootNodeSigningJob,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     rootCreationNode.nodeTxSigningCommitment = rootNodeSigningCommitment;
     const leftChild = root.children[0];
@@ -3656,7 +3629,11 @@ var TreeCreationService = class {
       signature: {
         nodeId: creationResponseNode.nodeId,
         nodeTxSignature,
-        refundTxSignature
+        refundTxSignature,
+        // TODO: Add direct refund signature
+        directNodeTxSignature: new Uint8Array(),
+        directRefundTxSignature: new Uint8Array(),
+        directFromCpfpRefundTxSignature: new Uint8Array()
       }
     };
   }
@@ -3708,7 +3685,7 @@ var TreeCreationService = class {
 
 // src/spark-wallet/spark-wallet.ts
 import { LRCWallet } from "@buildonspark/lrc20-sdk";
-import { sha256 as sha2567 } from "@noble/hashes/sha2";
+import { sha256 as sha2566 } from "@noble/hashes/sha2";
 import { EventEmitter } from "eventemitter3";
 
 // src/services/signing.ts
@@ -3789,7 +3766,7 @@ var SigningService = class {
 
 // src/tests/utils/test-faucet.ts
 import { bytesToHex as bytesToHex3, hexToBytes as hexToBytes6 } from "@noble/curves/abstract/utils";
-import { schnorr as schnorr2, secp256k1 as secp256k15 } from "@noble/curves/secp256k1";
+import { schnorr as schnorr2, secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
 import * as btc2 from "@scure/btc-signer";
 import { Address as Address3, OutScript as OutScript3, SigHash, Transaction as Transaction5 } from "@scure/btc-signer";
 import { taprootTweakPrivKey } from "@scure/btc-signer/utils";
@@ -3809,7 +3786,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     this.username = username;
     this.password = password;
     this.miningAddress = getP2TRAddressFromPublicKey(
-      secp256k15.getPublicKey(STATIC_MINING_KEY),
+      secp256k14.getPublicKey(STATIC_MINING_KEY),
       4 /* LOCAL */
     );
   }
@@ -3848,7 +3825,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     });
   }
   async refill() {
-    const minerPubKey = secp256k15.getPublicKey(STATIC_MINING_KEY);
+    const minerPubKey = secp256k14.getPublicKey(STATIC_MINING_KEY);
     const address = getP2TRAddressFromPublicKey(minerPubKey, 4 /* LOCAL */);
     const scanResult = await this.call("scantxoutset", [
       "start",
@@ -3897,7 +3874,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       txid: selectedUtxo.txid,
       index: selectedUtxo.vout
     });
-    const faucetPubKey = secp256k15.getPublicKey(STATIC_FAUCET_KEY);
+    const faucetPubKey = secp256k14.getPublicKey(STATIC_FAUCET_KEY);
     const script = getP2TRScriptFromPublicKey(faucetPubKey, 4 /* LOCAL */);
     for (let i = 0; i < numCoinsToCreate; i++) {
       splitTx.addOutput({
@@ -3958,7 +3935,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     await this.broadcastTx(bytesToHex3(signedTx.extract()));
   }
   async signFaucetCoin(unsignedTx, fundingTxOut, key) {
-    const pubKey = secp256k15.getPublicKey(key);
+    const pubKey = secp256k14.getPublicKey(key);
     const internalKey = pubKey.slice(1);
     const script = getP2TRScriptFromPublicKey(pubKey, 4 /* LOCAL */);
     unsignedTx.updateInput(0, {
@@ -4040,8 +4017,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     return response;
   }
   async getNewAddress() {
-    const key = secp256k15.utils.randomPrivateKey();
-    const pubKey = secp256k15.getPublicKey(key);
+    const key = secp256k14.utils.randomPrivateKey();
+    const pubKey = secp256k14.getPublicKey(key);
     return getP2TRAddressFromPublicKey(pubKey, 4 /* LOCAL */);
   }
   async sendToAddress(address, amount) {
@@ -4062,8 +4039,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     });
     const changeAmount = availableAmount - amount;
     if (changeAmount > 0) {
-      const changeKey = secp256k15.utils.randomPrivateKey();
-      const changePubKey = secp256k15.getPublicKey(changeKey);
+      const changeKey = secp256k14.utils.randomPrivateKey();
+      const changePubKey = secp256k14.getPublicKey(changeKey);
       const changeScript = getP2TRScriptFromPublicKey(
         changePubKey,
         4 /* LOCAL */
@@ -4076,8 +4053,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     const signedTx = await this.signFaucetCoin(tx, coin.txout, coin.key);
     const txHex = bytesToHex3(signedTx.extract());
     await this.broadcastTx(txHex);
-    const randomKey = secp256k15.utils.randomPrivateKey();
-    const randomPubKey = secp256k15.getPublicKey(randomKey);
+    const randomKey = secp256k14.utils.randomPrivateKey();
+    const randomPubKey = secp256k14.getPublicKey(randomKey);
     const randomAddress = getP2TRAddressFromPublicKey(
       randomPubKey,
       4 /* LOCAL */
@@ -4099,6 +4076,35 @@ function chunkArray(arr, size) {
   return chunks;
 }
 
+// src/utils/token-identifier.ts
+import { bech32m } from "@scure/base";
+var HumanReadableTokenIdentifierNetworkPrefix = {
+  MAINNET: "btk",
+  REGTEST: "btkrt",
+  TESTNET: "btkt",
+  SIGNET: "btks",
+  LOCAL: "btkl"
+};
+function encodeHumanReadableTokenIdentifier(payload) {
+  try {
+    const words = bech32m.toWords(payload.tokenIdentifier);
+    return bech32m.encode(
+      HumanReadableTokenIdentifierNetworkPrefix[payload.network],
+      words,
+      500
+    );
+  } catch (error) {
+    throw new ValidationError(
+      "Failed to encode human readable token identifier",
+      {
+        field: "tokenIdentifier",
+        value: payload.tokenIdentifier
+      },
+      error
+    );
+  }
+}
+
 // src/spark-wallet/spark-wallet.ts
 var SparkWallet = class _SparkWallet extends EventEmitter {
   config;
@@ -4209,7 +4215,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       } else if (event?.$case === "deposit" && event.deposit.deposit) {
         const deposit = event.deposit.deposit;
         const signingKey = await this.config.signer.generatePublicKey(
-          sha2567(deposit.id)
+          sha2566(deposit.id)
         );
         const newLeaf = await this.transferService.extendTimelock(
           deposit,
@@ -4364,7 +4370,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             if (leaf.status !== operatorLeaf.status || !leaf.signingKeyshare || !operatorLeaf.signingKeyshare || !equalBytes3(
               leaf.signingKeyshare.publicKey,
               operatorLeaf.signingKeyshare.publicKey
-            ) || !equalBytes3(leaf.nodeTx, operatorLeaf.nodeTx) || !equalBytes3(leaf.refundTx, operatorLeaf.refundTx)) {
+            ) || !equalBytes3(leaf.nodeTx, operatorLeaf.nodeTx)) {
               leavesToIgnore.add(nodeId);
             }
           }
@@ -4376,7 +4382,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     };
     for (const [id, leaf] of Object.entries(leaves.nodes)) {
       if (!verifyKey(
-        await this.config.signer.generatePublicKey(sha2567(leaf.id)),
+        await this.config.signer.generatePublicKey(sha2566(leaf.id)),
         leaf.signingKeyshare?.publicKey ?? new Uint8Array(),
         leaf.verifyingPublicKey
       )) {
@@ -4387,13 +4393,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 +4428,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 +4703,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,20 +4750,20 @@ 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,
         signingPubKey: await this.config.signer.generatePublicKey(
-          sha2567(leaf.id)
+          sha2566(leaf.id)
         ),
         newSigningPubKey: await this.config.signer.generatePublicKey()
       }))
@@ -4756,14 +4816,15 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       }
       const sspClient = this.getSspClient();
       const adaptorPubkey = bytesToHex4(
-        secp256k16.getPublicKey(adaptorPrivateKey)
+        secp256k15.getPublicKey(adaptorPrivateKey)
       );
       let request = null;
       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 +4880,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}`);
@@ -4851,27 +4922,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       offset: transfers.offset
     };
   }
-  /**
-   * Gets the held token info for the wallet.
-   *
-   * @deprecated The information is returned in getBalance
-   */
-  async getTokenInfo() {
-    console.warn("getTokenInfo is deprecated. Use getBalance instead.");
-    await this.syncTokenOutputs();
-    const lrc20Client = await this.lrc20ConnectionManager.createLrc20Client();
-    const { balance, tokenBalances } = await this.getBalance();
-    const tokenInfo = await lrc20Client.getTokenPubkeyInfo({
-      publicKeys: Array.from(tokenBalances.keys()).map(hexToBytes7)
-    });
-    return tokenInfo.tokenPubkeyInfos.map((info) => ({
-      tokenPublicKey: bytesToHex4(info.announcement.publicKey.publicKey),
-      tokenName: info.announcement.name,
-      tokenSymbol: info.announcement.symbol,
-      tokenDecimals: Number(bytesToNumberBE2(info.announcement.decimal)),
-      maxSupply: bytesToNumberBE2(info.announcement.maxSupply)
-    }));
-  }
   /**
    * Gets the current balance of the wallet.
    * You can use the forceRefetch option to synchronize your wallet and claim any
@@ -4879,7 +4929,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    *
    * @returns {Promise<Object>} Object containing:
    *   - balance: The wallet's current balance in satoshis
-   *   - tokenBalances: Map of token public keys to token balances and token info
+   *   - tokenBalances: Map of the human readable token identifier to token balances and token info
    */
   async getBalance() {
     const leaves = await this.getLeaves(true);
@@ -4896,24 +4946,29 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     };
   }
   async getTokenBalance() {
-    const lrc20Client = await this.lrc20ConnectionManager.createLrc20Client();
-    const tokenInfo = await lrc20Client.getTokenPubkeyInfo({
-      publicKeys: Array.from(this.tokenOutputs.keys()).map(hexToBytes7)
+    const sparkTokenClient = await this.connectionManager.createSparkTokenClient(
+      this.config.getCoordinatorAddress()
+    );
+    const tokenMetadata = await sparkTokenClient.query_token_metadata({
+      issuerPublicKeys: Array.from(this.tokenOutputs.keys()).map(hexToBytes7)
     });
     const result = /* @__PURE__ */ new Map();
-    for (const info of tokenInfo.tokenPubkeyInfos) {
-      const tokenPublicKey = bytesToHex4(
-        info.announcement.publicKey.publicKey
-      );
+    for (const metadata of tokenMetadata.tokenMetadata) {
+      const tokenPublicKey = bytesToHex4(metadata.issuerPublicKey);
       const leaves = this.tokenOutputs.get(tokenPublicKey);
-      result.set(tokenPublicKey, {
+      const humanReadableTokenIdentifier = encodeHumanReadableTokenIdentifier({
+        tokenIdentifier: metadata.tokenIdentifier,
+        network: this.config.getNetworkType()
+      });
+      result.set(humanReadableTokenIdentifier, {
         balance: leaves ? calculateAvailableTokenAmount(leaves) : BigInt(0),
-        tokenInfo: {
+        tokenMetadata: {
           tokenPublicKey,
-          tokenName: info.announcement.name,
-          tokenSymbol: info.announcement.symbol,
-          tokenDecimals: Number(bytesToNumberBE2(info.announcement.decimal)),
-          maxSupply: bytesToNumberBE2(info.announcement.maxSupply)
+          rawTokenIdentifier: metadata.tokenIdentifier,
+          tokenName: metadata.tokenName,
+          tokenTicker: metadata.tokenTicker,
+          decimals: metadata.decimals,
+          maxSupply: bytesToNumberBE2(metadata.maxSupply)
         }
       });
     }
@@ -4971,7 +5026,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       signingPubkey = await this.config.signer.generateStaticDepositKey(0);
     } else {
       signingPubkey = await this.config.signer.generatePublicKey(
-        sha2567(leafId)
+        sha2566(leafId)
       );
     }
     const address = await this.depositService.generateDepositAddress({
@@ -5058,7 +5113,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       creditAmountSats,
       sspSignature
     );
-    const hashBuffer = sha2567(message);
+    const hashBuffer = sha2566(message);
     const signatureBytes = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
     const signature = bytesToHex4(signatureBytes);
     const response = await this.sspClient.claimStaticDeposit({
@@ -5147,7 +5202,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       creditAmountSats,
       bytesToHex4(spendTxSighash)
     );
-    const hashBuffer = sha2567(message);
+    const hashBuffer = sha2566(message);
     const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
@@ -5360,13 +5415,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 +5502,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;
@@ -5452,7 +5536,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         signingPubKey = depositAddress.userSigningPublicKey;
       } else {
         signingPubKey = await this.config.signer.generatePublicKey(
-          sha2567(depositAddress.leafId)
+          sha2566(depositAddress.leafId)
         );
       }
       const nodes2 = await this.finalizeDeposit({
@@ -5476,14 +5560,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,14 +5668,16 @@ 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(
         leavesToSend.map(async (leaf) => ({
           leaf,
           signingPubKey: await this.config.signer.generatePublicKey(
-            sha2567(leaf.id)
+            sha2566(leaf.id)
           ),
           newSigningPubKey: await this.config.signer.generatePublicKey()
         }))
@@ -5643,7 +5726,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const nodesToAdd = [];
     for (const node of nodesToExtend) {
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const { nodes: nodes2 } = await this.transferService.extendTimelock(
         node,
@@ -5710,7 +5793,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const { nodes: nodes2 } = await this.transferService.refreshTimelockNodes(
         [node],
         parentNode,
-        await this.config.signer.generatePublicKey(sha2567(node.id))
+        await this.config.signer.generatePublicKey(sha2566(node.id))
       );
       if (nodes2.length !== 1) {
         throw new Error(`expected 1 node, got ${nodes2.length}`);
@@ -5762,7 +5845,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
                 },
                 signingPubKey: leafPubKey,
                 newSigningPubKey: await this.config.signer.generatePublicKey(
-                  sha2567(leaf.leaf.id)
+                  sha2566(leaf.leaf.id)
                 )
               });
             }
@@ -5830,7 +5913,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(
@@ -5955,22 +6038,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         const sparkFallbackAddress = decodeInvoice(
           invoice2.invoice.encodedInvoice
         ).fallbackAddress;
-        if (sparkFallbackAddress && isValidSparkFallback(hexToBytes7(sparkFallbackAddress))) {
-          const invoiceIdentityPubkey = sparkFallbackAddress.slice(6);
-          const expectedIdentityPubkey = receiverIdentityPubkey2 ?? await this.getIdentityPublicKey();
-          if (invoiceIdentityPubkey !== expectedIdentityPubkey) {
-            throw new ValidationError(
-              "Mismatch between spark identity embedded in lightning invoice and designated recipient spark identity",
-              {
-                field: "sparkFallbackAddress",
-                value: invoiceIdentityPubkey,
-                expected: expectedIdentityPubkey
-              }
-            );
-          }
-        } else {
+        if (!sparkFallbackAddress) {
           throw new ValidationError(
-            "No valid spark fallback address found in lightning invoice",
+            "No spark fallback address found in lightning invoice",
             {
               field: "sparkFallbackAddress",
               value: sparkFallbackAddress,
@@ -5978,6 +6048,17 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             }
           );
         }
+        const expectedIdentityPubkey = receiverIdentityPubkey2 ?? await this.getIdentityPublicKey();
+        if (sparkFallbackAddress !== expectedIdentityPubkey) {
+          throw new ValidationError(
+            "Mismatch between spark identity embedded in lightning invoice and designated recipient spark identity",
+            {
+              field: "sparkFallbackAddress",
+              value: sparkFallbackAddress,
+              expected: expectedIdentityPubkey
+            }
+          );
+        }
       }
       return invoice2;
     };
@@ -6056,9 +6137,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           "No valid spark address found in invoice. Defaulting to lightning."
         );
       } else {
-        const identityPublicKey = sparkFallbackAddress.slice(6);
         const receiverSparkAddress = encodeSparkAddress({
-          identityPublicKey,
+          identityPublicKey: sparkFallbackAddress,
           network: Network[invoiceNetwork]
         });
         return await this.transfer({
@@ -6089,14 +6169,14 @@ 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(
         leaves.map(async (leaf) => ({
           leaf,
           signingPubKey: await this.config.signer.generatePublicKey(
-            sha2567(leaf.id)
+            sha2566(leaf.id)
           ),
           newSigningPubKey: await this.config.signer.generatePublicKey()
         }))
@@ -6199,13 +6279,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 +6300,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 +6317,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 +6325,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,25 +6360,56 @@ 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)
+          sha2566(leaf.id)
         ),
         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 +6447,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 +6461,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
     });
@@ -6374,7 +6489,14 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<Transfer | undefined>} The transfer
    */
   async getTransfer(id) {
-    return await this.transferService.queryTransfer(id);
+    const transfer = await this.transferService.queryTransfer(id);
+    if (!transfer) {
+      return void 0;
+    }
+    return mapTransferToWalletTransfer(
+      transfer,
+      bytesToHex4(await this.config.signer.getIdentityPublicKey())
+    );
   }
   // ***** Token Flow *****
   /**
@@ -6385,10 +6507,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    */
   async syncTokenOutputs() {
     this.tokenOutputs.clear();
-    const unsortedTokenOutputs = await this.tokenTransactionService.fetchOwnedTokenOutputs(
-      [await this.config.signer.getIdentityPublicKey()],
-      []
-    );
+    const unsortedTokenOutputs = await this.tokenTransactionService.fetchOwnedTokenOutputs({
+      ownerPublicKeys: [await this.config.signer.getIdentityPublicKey()]
+    });
     const filteredTokenOutputs = unsortedTokenOutputs.filter(
       (output) => !this.pendingWithdrawnOutputIds.includes(output.output?.id || "")
     );
@@ -6487,29 +6608,21 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * Retrieves token transaction history for specified tokens owned by the wallet.
    * Can optionally filter by specific transaction hashes.
    *
-   * @param tokenPublicKeys - Array of token public keys to query transactions for
+   * @param ownerPublicKeys - Optional array of owner public keys to query transactions for
+   * @param issuerPublicKeys - Optional array of issuer public keys to query transactions for
    * @param tokenTransactionHashes - Optional array of specific transaction hashes to filter by
+   * @param tokenIdentifiers - Optional array of token identifiers to filter by
+   * @param outputIds - Optional array of output IDs to filter by
    * @returns Promise resolving to array of token transactions with their current status
    */
-  async queryTokenTransactions(tokenPublicKeys, tokenTransactionHashes) {
-    const sparkClient = await this.connectionManager.createSparkClient(
-      this.config.getCoordinatorAddress()
-    );
-    let queryParams;
-    if (tokenTransactionHashes?.length) {
-      queryParams = {
-        tokenPublicKeys: tokenPublicKeys?.map(hexToBytes7),
-        ownerPublicKeys: [hexToBytes7(await this.getIdentityPublicKey())],
-        tokenTransactionHashes: tokenTransactionHashes.map(hexToBytes7)
-      };
-    } else {
-      queryParams = {
-        tokenPublicKeys: tokenPublicKeys?.map(hexToBytes7),
-        ownerPublicKeys: [hexToBytes7(await this.getIdentityPublicKey())]
-      };
-    }
-    const response = await sparkClient.query_token_transactions(queryParams);
-    return response.tokenTransactionsWithStatus;
+  async queryTokenTransactions(ownerPublicKeys, issuerPublicKeys, tokenTransactionHashes, tokenIdentifiers, outputIds) {
+    return this.tokenTransactionService.queryTokenTransactions({
+      ownerPublicKeys,
+      issuerPublicKeys,
+      tokenTransactionHashes,
+      tokenIdentifiers,
+      outputIds
+    });
   }
   async getTokenL1Address() {
     return getP2WPKHAddressFromPublicKey(
@@ -6525,7 +6638,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} The signed message
    */
   async signMessageWithIdentityKey(message, compact) {
-    const hash = sha2567(message);
+    const hash = sha2566(message);
     const signature = await this.config.signer.signMessageWithIdentityKey(
       hash,
       compact
@@ -6540,7 +6653,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<boolean>} Whether the message is valid
    */
   async validateMessageWithIdentityKey(message, signature) {
-    const hash = sha2567(message);
+    const hash = sha2566(message);
     if (typeof signature === "string") {
       signature = hexToBytes7(signature);
     }
@@ -6847,7 +6960,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         });
       }
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const result = await this.transferService.refreshTimelockNodes(
         [node],
@@ -6899,7 +7012,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         });
       }
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const result = await this.transferService.refreshTimelockRefundTx(
         node,