@buildonspark/spark-sdk 0.1.35 → 0.1.37

package/dist/native/index.cjs

@@ -40,8 +40,13 @@ var init_buffer = __esm({
     if (typeof globalThis.Buffer === "undefined") {
       globalThis.Buffer = import_buffer.Buffer;
     }
-    if (typeof global === "undefined") {
-      window.global = window.globalThis;
+    if (typeof window !== "undefined") {
+      if (typeof window.global === "undefined") {
+        window.global = window;
+      }
+      if (typeof window.globalThis === "undefined") {
+        window.globalThis = window;
+      }
     }
   }
 });
@@ -1501,7 +1506,6 @@ var NativeSparkFrost = class {
 init_buffer();
 var import_utils4 = require("@noble/curves/abstract/utils");
 var import_secp256k15 = require("@noble/curves/secp256k1");
-var import_sha2 = require("@noble/hashes/sha2");
 var import_bip32 = require("@scure/bip32");
 var import_bip39 = require("@scure/bip39");
 var import_english = require("@scure/bip39/wordlists/english");
@@ -1824,7 +1828,7 @@ function getSigningCommitmentFromNonce(nonce) {
 var import_lrc20_sdk = require("@buildonspark/lrc20-sdk");
 var import_lrc20_sdk2 = require("@buildonspark/lrc20-sdk");
 var import_secp256k16 = require("@bitcoinerlab/secp256k1");
-var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
+var import_sha2 = require("@noble/hashes/sha2");
 var import_lrc20_sdk3 = require("@buildonspark/lrc20-sdk");
 var sparkFrostModule = void 0;
 var getSparkFrostModule = async () => {
@@ -2291,15 +2295,11 @@ var DefaultSparkSigner = class {
     }
     if (receipt) {
       const receiptPrivateKey = this.getReceiptPrivateKey(receipt);
-      const tweakedKeyPair = import_lrc20_sdk3.ECPair.fromPrivateKey(
-        import_buffer.Buffer.from(receiptPrivateKey)
-      );
+      const tweakedKeyPair = (0, import_lrc20_sdk3.fromPrivateKey)(import_buffer.Buffer.from(receiptPrivateKey));
       psbt.signInput(input, tweakedKeyPair, sighashTypes);
       return psbt;
     }
-    const keypair = import_lrc20_sdk3.ECPair.fromPrivateKey(
-      import_buffer.Buffer.from(this.identityKey.privateKey)
-    );
+    const keypair = (0, import_lrc20_sdk3.fromPrivateKey)(import_buffer.Buffer.from(this.identityKey.privateKey));
     psbt.signInput(input, keypair, sighashTypes);
     return psbt;
   }
@@ -2311,7 +2311,7 @@ var DefaultSparkSigner = class {
       innerKey = import_buffer.Buffer.concat([import_lrc20_sdk.PARITY, innerKey.slice(1)]);
       privateKey = import_buffer.Buffer.from((0, import_secp256k16.privateNegate)(privateKey));
     }
-    const pxhPubkey = bitcoin.crypto.sha256(import_buffer.Buffer.concat([pxh, innerKey]));
+    const pxhPubkey = (0, import_sha2.sha256)(import_buffer.Buffer.concat([pxh, innerKey]));
     const receiptProof = (0, import_secp256k16.privateAdd)(privateKey, pxhPubkey);
     return import_buffer.Buffer.from(receiptProof);
   }
@@ -10455,6 +10455,203 @@ var FinalizeTransferRequest = {
     return message;
   }
 };
+function createBaseFinalizeTransferWithTransferPackageRequest() {
+  return {
+    transferId: "",
+    ownerIdentityPublicKey: new Uint8Array(0),
+    transferPackage: void 0,
+    refundSignatures: {}
+  };
+}
+var FinalizeTransferWithTransferPackageRequest = {
+  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);
+    }
+    if (message.transferPackage !== void 0) {
+      TransferPackage.encode(message.transferPackage, writer.uint32(26).fork()).join();
+    }
+    Object.entries(message.refundSignatures).forEach(([key, value]) => {
+      FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.encode(
+        { key, value },
+        writer.uint32(34).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 = createBaseFinalizeTransferWithTransferPackageRequest();
+    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.transferPackage = TransferPackage.decode(reader, reader.uint32());
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          const entry4 = FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.decode(
+            reader,
+            reader.uint32()
+          );
+          if (entry4.value !== void 0) {
+            message.refundSignatures[entry4.key] = entry4.value;
+          }
+          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),
+      transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0,
+      refundSignatures: isObject8(object.refundSignatures) ? Object.entries(object.refundSignatures).reduce((acc, [key, value]) => {
+        acc[key] = bytesFromBase642(value);
+        return acc;
+      }, {}) : {}
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.transferId !== "") {
+      obj.transferId = message.transferId;
+    }
+    if (message.ownerIdentityPublicKey.length !== 0) {
+      obj.ownerIdentityPublicKey = base64FromBytes2(message.ownerIdentityPublicKey);
+    }
+    if (message.transferPackage !== void 0) {
+      obj.transferPackage = TransferPackage.toJSON(message.transferPackage);
+    }
+    if (message.refundSignatures) {
+      const entries = Object.entries(message.refundSignatures);
+      if (entries.length > 0) {
+        obj.refundSignatures = {};
+        entries.forEach(([k, v]) => {
+          obj.refundSignatures[k] = base64FromBytes2(v);
+        });
+      }
+    }
+    return obj;
+  },
+  create(base) {
+    return FinalizeTransferWithTransferPackageRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseFinalizeTransferWithTransferPackageRequest();
+    message.transferId = object.transferId ?? "";
+    message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
+    message.transferPackage = object.transferPackage !== void 0 && object.transferPackage !== null ? TransferPackage.fromPartial(object.transferPackage) : void 0;
+    message.refundSignatures = Object.entries(object.refundSignatures ?? {}).reduce(
+      (acc, [key, value]) => {
+        if (value !== void 0) {
+          acc[key] = value;
+        }
+        return acc;
+      },
+      {}
+    );
+    return message;
+  }
+};
+function createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry() {
+  return { key: "", value: new Uint8Array(0) };
+}
+var FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry = {
+  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 = createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry();
+    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 FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry();
+    message.key = object.key ?? "";
+    message.value = object.value ?? new Uint8Array(0);
+    return message;
+  }
+};
 function createBaseFinalizeTransferResponse() {
   return { transfer: void 0 };
 }
@@ -15737,7 +15934,7 @@ var InitiateUtxoSwapRequest = {
       writer.uint32(50).bytes(message.userSignature);
     }
     if (message.transfer !== void 0) {
-      StartUserSignedTransferRequest.encode(message.transfer, writer.uint32(58).fork()).join();
+      StartTransferRequest.encode(message.transfer, writer.uint32(58).fork()).join();
     }
     if (message.spendTxSigningJob !== void 0) {
       SigningJob.encode(message.spendTxSigningJob, writer.uint32(66).fork()).join();
@@ -15797,7 +15994,7 @@ var InitiateUtxoSwapRequest = {
           if (tag !== 58) {
             break;
           }
-          message.transfer = StartUserSignedTransferRequest.decode(reader, reader.uint32());
+          message.transfer = StartTransferRequest.decode(reader, reader.uint32());
           continue;
         }
         case 8: {
@@ -15822,7 +16019,7 @@ var InitiateUtxoSwapRequest = {
       amount: isSet3(object.creditAmountSats) ? { $case: "creditAmountSats", creditAmountSats: globalThis.Number(object.creditAmountSats) } : isSet3(object.maxFeeSats) ? { $case: "maxFeeSats", maxFeeSats: globalThis.Number(object.maxFeeSats) } : void 0,
       sspSignature: isSet3(object.sspSignature) ? bytesFromBase642(object.sspSignature) : new Uint8Array(0),
       userSignature: isSet3(object.userSignature) ? bytesFromBase642(object.userSignature) : new Uint8Array(0),
-      transfer: isSet3(object.transfer) ? StartUserSignedTransferRequest.fromJSON(object.transfer) : void 0,
+      transfer: isSet3(object.transfer) ? StartTransferRequest.fromJSON(object.transfer) : void 0,
       spendTxSigningJob: isSet3(object.spendTxSigningJob) ? SigningJob.fromJSON(object.spendTxSigningJob) : void 0
     };
   },
@@ -15846,7 +16043,7 @@ var InitiateUtxoSwapRequest = {
       obj.userSignature = base64FromBytes2(message.userSignature);
     }
     if (message.transfer !== void 0) {
-      obj.transfer = StartUserSignedTransferRequest.toJSON(message.transfer);
+      obj.transfer = StartTransferRequest.toJSON(message.transfer);
     }
     if (message.spendTxSigningJob !== void 0) {
       obj.spendTxSigningJob = SigningJob.toJSON(message.spendTxSigningJob);
@@ -15876,7 +16073,7 @@ var InitiateUtxoSwapRequest = {
     }
     message.sspSignature = object.sspSignature ?? new Uint8Array(0);
     message.userSignature = object.userSignature ?? new Uint8Array(0);
-    message.transfer = object.transfer !== void 0 && object.transfer !== null ? StartUserSignedTransferRequest.fromPartial(object.transfer) : void 0;
+    message.transfer = object.transfer !== void 0 && object.transfer !== null ? StartTransferRequest.fromPartial(object.transfer) : void 0;
     message.spendTxSigningJob = object.spendTxSigningJob !== void 0 && object.spendTxSigningJob !== null ? SigningJob.fromPartial(object.spendTxSigningJob) : void 0;
     return message;
   }
@@ -16851,6 +17048,14 @@ var SparkServiceDefinition = {
       responseStream: false,
       options: {}
     },
+    finalize_transfer_with_transfer_package: {
+      name: "finalize_transfer_with_transfer_package",
+      requestType: FinalizeTransferWithTransferPackageRequest,
+      requestStream: false,
+      responseType: FinalizeTransferResponse,
+      responseStream: false,
+      options: {}
+    },
     cancel_transfer: {
       name: "cancel_transfer",
       requestType: CancelTransferRequest,
@@ -17222,7 +17427,7 @@ init_buffer();
 init_buffer();
 var import_lrc20_sdk4 = require("@buildonspark/lrc20-sdk");
 var btc = __toESM(require("@scure/btc-signer"), 1);
-var bitcoin2 = __toESM(require("bitcoinjs-lib"), 1);
+var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
 var Network2 = /* @__PURE__ */ ((Network5) => {
   Network5[Network5["MAINNET"] = 0] = "MAINNET";
   Network5[Network5["TESTNET"] = 1] = "TESTNET";
@@ -17247,11 +17452,11 @@ var NetworkConfig = {
 };
 var getNetwork = (network) => NetworkConfig[network];
 var LRC_WALLET_NETWORK = Object.freeze({
-  [0 /* MAINNET */]: bitcoin2.networks.bitcoin,
-  [1 /* TESTNET */]: bitcoin2.networks.testnet,
-  [2 /* SIGNET */]: bitcoin2.networks.testnet,
-  [3 /* REGTEST */]: bitcoin2.networks.regtest,
-  [4 /* LOCAL */]: bitcoin2.networks.regtest
+  [0 /* MAINNET */]: bitcoin.networks.bitcoin,
+  [1 /* TESTNET */]: bitcoin.networks.testnet,
+  [2 /* SIGNET */]: bitcoin.networks.testnet,
+  [3 /* REGTEST */]: bitcoin.networks.regtest,
+  [4 /* LOCAL */]: bitcoin.networks.regtest
 });
 var LRC_WALLET_NETWORK_TYPE = Object.freeze({
   [0 /* MAINNET */]: import_lrc20_sdk4.NetworkType.MAINNET,
@@ -17262,7 +17467,7 @@ var LRC_WALLET_NETWORK_TYPE = Object.freeze({
 });
 function getNetworkFromAddress(address2) {
   try {
-    const decoded = bitcoin2.address.fromBech32(address2);
+    const decoded = bitcoin.address.fromBech32(address2);
     if (decoded.prefix === "bc") {
       return "MAINNET" /* MAINNET */;
     } else if (decoded.prefix === "bcrt") {
@@ -19309,7 +19514,8 @@ var TransferService = class extends BaseTransferService {
         types: [
           2 /* TRANSFER */,
           0 /* PREIMAGE_SWAP */,
-          1 /* COOPERATIVE_EXIT */
+          1 /* COOPERATIVE_EXIT */,
+          3 /* UTXO_SWAP */
         ],
         network: NetworkToProto[this.config.getNetwork()]
       });
@@ -20637,7 +20843,7 @@ function verifySignature(words, prefix) {
 }
 
 // src/services/lightning.ts
-var crypto3 = getCrypto();
+var crypto2 = getCrypto();
 var LightningService = class {
   config;
   connectionManager;
@@ -20654,7 +20860,7 @@ var LightningService = class {
     receiverIdentityPubkey,
     descriptionHash
   }) {
-    const randBytes = crypto3.getRandomValues(new Uint8Array(32));
+    const randBytes = crypto2.getRandomValues(new Uint8Array(32));
     const preimage = (0, import_utils11.numberToBytesBE)(
       (0, import_utils11.bytesToNumberBE)(randBytes) % import_secp256k111.secp256k1.CURVE.n,
       32
@@ -26370,7 +26576,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (event?.$case === "transfer" && event.transfer.transfer && event.transfer.transfer.type !== 40 /* COUNTER_SWAP */) {
         const { senderIdentityPublicKey, receiverIdentityPublicKey } = event.transfer.transfer;
         if (event.transfer.transfer && !(0, import_utils21.equalBytes)(senderIdentityPublicKey, receiverIdentityPublicKey)) {
-          await this.claimTransfer(event.transfer.transfer, true);
+          await this.claimTransfer({
+            transfer: event.transfer.transfer,
+            emit: true,
+            optimize: true
+          });
         }
       } else if (event?.$case === "deposit" && event.deposit.deposit) {
         const deposit = event.deposit.deposit;
@@ -26496,10 +26706,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     }
   }
   async getLeaves(isBalanceCheck = false) {
-    const sparkClient = await this.connectionManager.createSparkClient(
-      this.config.getCoordinatorAddress()
-    );
-    const leaves = await sparkClient.query_nodes({
+    const leaves = await this.queryNodes({
       source: {
         $case: "ownerIdentityPubkey",
         ownerIdentityPubkey: await this.config.signer.getIdentityPublicKey()
@@ -26513,17 +26720,17 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         this.config.getSigningOperators()
       )) {
         if (id !== this.config.getCoordinatorIdentifier()) {
-          const client = await this.connectionManager.createSparkClient(
+          const operatorLeaves = await this.queryNodes(
+            {
+              source: {
+                $case: "ownerIdentityPubkey",
+                ownerIdentityPubkey: await this.config.signer.getIdentityPublicKey()
+              },
+              includeParents: false,
+              network: NetworkToProto[this.config.getNetwork()]
+            },
             operator.address
           );
-          const operatorLeaves = await client.query_nodes({
-            source: {
-              $case: "ownerIdentityPubkey",
-              ownerIdentityPubkey: await this.config.signer.getIdentityPublicKey()
-            },
-            includeParents: false,
-            network: NetworkToProto[this.config.getNetwork()]
-          });
           for (const [nodeId, leaf] of Object.entries(leaves.nodes)) {
             const operatorLeaf = operatorLeaves.nodes[nodeId];
             if (!operatorLeaf) {
@@ -26652,10 +26859,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
   }
   async syncWallet() {
     await this.syncTokenOutputs();
-    this.leaves = await this.getLeaves();
-    await this.config.signer.restoreSigningKeysFromLeafs(this.leaves);
-    await this.checkRefreshTimelockNodes();
-    await this.checkExtendTimeLockNodes();
+    let leaves = await this.getLeaves();
+    await this.config.signer.restoreSigningKeysFromLeafs(leaves);
+    leaves = await this.checkRefreshTimelockNodes(leaves);
+    leaves = await this.checkExtendTimeLockNodes(leaves);
+    this.leaves = leaves;
     this.optimizeLeaves().catch((e) => {
       console.error("Failed to optimize leaves", e);
     });
@@ -26799,11 +27007,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         expected: "smaller or equal to " + Number.MAX_SAFE_INTEGER
       });
     }
-    try {
-      await this.claimTransfers();
-    } catch (e) {
-      console.warn("Unabled to claim transfers.");
-    }
     let leavesToSwap;
     if (targetAmount && leaves && leaves.length > 0) {
       if (targetAmount < leaves.reduce((acc, leaf) => acc + leaf.value, 0)) {
@@ -26902,10 +27105,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (!request) {
         throw new Error("Failed to request leaves swap. No response returned.");
       }
-      const sparkClient = await this.connectionManager.createSparkClient(
-        this.config.getCoordinatorAddress()
-      );
-      const nodes = await sparkClient.query_nodes({
+      const nodes = await this.queryNodes({
         source: {
           $case: "nodeIds",
           nodeIds: {
@@ -27076,7 +27276,20 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    * @returns {Promise<string>} A Bitcoin address for depositing funds
    */
   async getStaticDepositAddress() {
-    return await this.generateDepositAddress(true);
+    try {
+      return await this.generateDepositAddress(true);
+    } catch (error) {
+      if (error.message?.includes("static deposit address already exists")) {
+        const existingAddresses = await this.queryStaticDepositAddresses();
+        if (existingAddresses.length > 0 && existingAddresses[0]) {
+          return existingAddresses[0];
+        } else {
+          throw error;
+        }
+      } else {
+        throw error;
+      }
+    }
   }
   /**
    * Generates a deposit address for receiving funds.
@@ -27659,7 +27872,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     const pendingTransfer = await this.transferService.queryTransfer(
       transfer.id
     );
-    const resultNodes = !pendingTransfer ? [] : await this.claimTransfer(pendingTransfer);
+    const resultNodes = !pendingTransfer ? [] : await this.claimTransfer({ transfer: pendingTransfer });
     const leavesToRemove = new Set(leaves.map((leaf) => leaf.id));
     this.leaves = [
       ...this.leaves.filter((leaf) => !leavesToRemove.has(leaf.id)),
@@ -27709,7 +27922,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     );
     return await this.withLeaves(async () => {
       let leavesToSend = await this.selectLeaves(amountSats);
-      await this.checkRefreshTimelockNodes(leavesToSend);
+      leavesToSend = await this.checkRefreshTimelockNodes(leavesToSend);
       leavesToSend = await this.checkExtendTimeLockNodes(leavesToSend);
       const leafKeyTweaks = await Promise.all(
         leavesToSend.map(async (leaf) => ({
@@ -27730,7 +27943,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         const transactionId = transfer.id;
         const pendingTransfer = await this.transferService.queryTransfer(transactionId);
         if (pendingTransfer) {
-          await this.claimTransfer(pendingTransfer);
+          await this.claimTransfer({
+            transfer: pendingTransfer,
+            optimize: true
+          });
         }
       }
       return mapTransferToWalletTransfer(
@@ -27740,11 +27956,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     });
   }
   async checkExtendTimeLockNodes(nodes) {
-    const nodesToCheck = nodes ?? this.leaves;
     const nodesToExtend = [];
     const nodeIds = [];
-    let resultNodes = [...nodesToCheck];
-    for (const node of nodesToCheck) {
+    const validNodes = [];
+    for (const node of nodes) {
       const nodeTx = getTxFromRawTxBytes(node.nodeTx);
       const { needRefresh } = getNextTransactionSequence(
         nodeTx.getInput(0).sequence
@@ -27752,9 +27967,14 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (needRefresh) {
         nodesToExtend.push(node);
         nodeIds.push(node.id);
+      } else {
+        validNodes.push(node);
       }
     }
-    resultNodes = resultNodes.filter((node) => !nodesToExtend.includes(node));
+    if (nodesToExtend.length === 0) {
+      return validNodes;
+    }
+    const nodesToAdd = [];
     for (const node of nodesToExtend) {
       const signingPubKey = await this.config.signer.generatePublicKey(
         (0, import_sha213.sha256)(node.id)
@@ -27765,9 +27985,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       );
       this.leaves = this.leaves.filter((leaf) => leaf.id !== node.id);
       const newNodes = await this.transferLeavesToSelf(nodes2, signingPubKey);
-      resultNodes.push(...newNodes);
+      nodesToAdd.push(...newNodes);
     }
-    return resultNodes;
+    this.updateLeaves(nodeIds, nodesToAdd);
+    validNodes.push(...nodesToAdd);
+    return validNodes;
   }
   /**
    * Internal method to refresh timelock nodes.
@@ -27779,7 +28001,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
   async checkRefreshTimelockNodes(nodes) {
     const nodesToRefresh = [];
     const nodeIds = [];
-    for (const node of nodes ?? this.leaves) {
+    const validNodes = [];
+    for (const node of nodes) {
       const refundTx = getTxFromRawTxBytes(node.refundTx);
       const { needRefresh } = getNextTransactionSequence(
         refundTx.getInput(0).sequence,
@@ -27788,15 +28011,14 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (needRefresh) {
         nodesToRefresh.push(node);
         nodeIds.push(node.id);
+      } else {
+        validNodes.push(node);
       }
     }
     if (nodesToRefresh.length === 0) {
-      return;
+      return validNodes;
     }
-    const sparkClient = await this.connectionManager.createSparkClient(
-      this.config.getCoordinatorAddress()
-    );
-    const nodesResp = await sparkClient.query_nodes({
+    const nodesResp = await this.queryNodes({
       source: {
         $case: "nodeIds",
         nodeIds: {
@@ -27810,6 +28032,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     for (const node of Object.values(nodesResp.nodes)) {
       nodesMap.set(node.id, node);
     }
+    const nodesToAdd = [];
     for (const node of nodesToRefresh) {
       if (!node.parentNodeId) {
         throw new Error(`node ${node.id} has no parent`);
@@ -27830,9 +28053,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (!newNode) {
         throw new Error("Failed to refresh timelock node");
       }
-      this.leaves = this.leaves.filter((leaf) => leaf.id !== node.id);
-      this.leaves.push(newNode);
+      nodesToAdd.push(newNode);
     }
+    this.updateLeaves(nodeIds, nodesToAdd);
+    validNodes.push(...nodesToAdd);
+    return validNodes;
   }
   /**
    * Claims a specific transfer.
@@ -27840,11 +28065,16 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    * @param {Transfer} transfer - The transfer to claim
    * @returns {Promise<Object>} The claim result
    */
-  async claimTransfer(transfer, emit = false, retryCount = 0) {
+  async claimTransfer({
+    transfer,
+    emit,
+    retryCount,
+    optimize
+  }) {
     const MAX_RETRIES = 5;
     const BASE_DELAY_MS = 1e3;
     const MAX_DELAY_MS = 1e4;
-    if (retryCount > 0) {
+    if (retryCount && retryCount > 0) {
       const delayMs = Math.min(
         BASE_DELAY_MS * Math.pow(2, retryCount - 1),
         MAX_DELAY_MS
@@ -27860,7 +28090,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
             const leafPubKey = leafPubKeyMap.get(leaf.leaf.id);
             if (leafPubKey) {
               leavesToClaim.push({
-                leaf: leaf.leaf,
+                leaf: {
+                  ...leaf.leaf,
+                  refundTx: leaf.intermediateRefundTx
+                },
                 signingPubKey: leafPubKey,
                 newSigningPubKey: await this.config.signer.generatePublicKey(
                   (0, import_sha213.sha256)(leaf.leaf.id)
@@ -27873,7 +28106,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
           transfer,
           leavesToClaim
         );
-        this.leaves.push(...response.nodes);
         if (emit) {
           this.emit(
             "transfer:claimed",
@@ -27883,14 +28115,25 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         }
         return response.nodes;
       });
-      await this.checkRefreshTimelockNodes(result);
+      result = await this.checkRefreshTimelockNodes(result);
       result = await this.checkExtendTimeLockNodes(result);
+      const existingIds = new Set(this.leaves.map((leaf) => leaf.id));
+      const uniqueResults = result.filter((node) => !existingIds.has(node.id));
+      this.leaves.push(...uniqueResults);
+      if (optimize && transfer.type !== 40 /* COUNTER_SWAP */) {
+        await this.optimizeLeaves();
+      }
       return result;
     } catch (error) {
-      if (retryCount < MAX_RETRIES) {
-        this.claimTransfer(transfer, emit, retryCount + 1);
+      if (retryCount && retryCount < MAX_RETRIES) {
+        this.claimTransfer({
+          transfer,
+          emit,
+          retryCount: retryCount + 1,
+          optimize
+        });
         return [];
-      } else if (retryCount > 0) {
+      } else if (retryCount) {
         console.warn(
           "Failed to claim transfer. Please try reinitializing your wallet in a few minutes. Transfer ID: " + transfer.id,
           error
@@ -27925,7 +28168,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         continue;
       }
       promises.push(
-        this.claimTransfer(transfer, emit).then(() => transfer.id).catch((error) => {
+        this.claimTransfer({ transfer, emit, optimize: true }).then(() => transfer.id).catch((error) => {
           console.warn(`Failed to claim transfer ${transfer.id}:`, error);
           return null;
         })
@@ -27960,11 +28203,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    *
    * @param {Object} params - Parameters for the lightning invoice
    * @param {number} params.amountSats - Amount in satoshis
-   * @param {string} params.memo - Description for the invoice
+   * @param {string} [params.memo] - Description for the invoice. Should not be provided if the descriptionHash is provided.
    * @param {number} [params.expirySeconds] - Optional expiry time in seconds
    * @param {boolean} [params.includeSparkAddress] - Optional boolean signalling whether or not to include the spark address in the invoice
    * @param {string} [params.receiverIdentityPubkey] - Optional public key of the wallet receiving the lightning invoice. If not present, the receiver will be the creator of this request.
-   * @param {string} [params.descriptionHash] - Optional h tag of the invoice. This is the hash of a longer description to include in the lightning invoice. It is used in LNURL and UMA as the hash of the metadata.
+   * @param {string} [params.descriptionHash] - Optional h tag of the invoice. This is the hash of a longer description to include in the lightning invoice. It is used in LNURL and UMA as the hash of the metadata. This field is mutually exclusive with the memo field. Only one or the other should be provided.
    * @returns {Promise<LightningReceiveRequest>} BOLT11 encoded invoice
    */
   async createLightningInvoice({
@@ -28011,6 +28254,16 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         expected: "Memo size within limits"
       });
     }
+    if (memo && descriptionHash) {
+      throw new ValidationError(
+        "Memo and descriptionHash cannot be provided together. Please provide only one.",
+        {
+          field: "memo",
+          value: memo,
+          expected: "Memo or descriptionHash"
+        }
+      );
+    }
     const requestLightningInvoice = async (amountSats2, paymentHash, memo2, receiverIdentityPubkey2, descriptionHash2) => {
       const network = this.config.getNetwork();
       let bitcoinNetwork = BitcoinNetwork_default.REGTEST;
@@ -28146,7 +28399,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         });
       }
       let leaves = await this.selectLeaves(totalAmount);
-      await this.checkRefreshTimelockNodes(leaves);
+      leaves = await this.checkRefreshTimelockNodes(leaves);
       leaves = await this.checkExtendTimeLockNodes(leaves);
       const leavesToSend = await Promise.all(
         leaves.map(async (leaf) => ({
@@ -28327,7 +28580,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         );
       }
     }
-    await this.checkRefreshTimelockNodes(leavesToSend);
+    leavesToSend = await this.checkRefreshTimelockNodes(leavesToSend);
     leavesToSend = await this.checkExtendTimeLockNodes(leavesToSend);
     const leafKeyTweaks = await Promise.all(
       leavesToSend.map(async (leaf) => ({
@@ -28397,7 +28650,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
     }
     let leaves = await this.selectLeaves(amountSats);
-    await this.checkRefreshTimelockNodes(leaves);
+    leaves = await this.checkRefreshTimelockNodes(leaves);
     leaves = await this.checkExtendTimeLockNodes(leaves);
     const feeEstimate = await sspClient.getCoopExitFeeEstimate({
       leafExternalIds: leaves.map((leaf) => leaf.id),
@@ -28631,6 +28884,33 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       }
     }, 1e4);
   }
+  async updateLeaves(leavesToRemove, leavesToAdd) {
+    const leavesToRemoveSet = new Set(leavesToRemove);
+    this.leaves = this.leaves.filter((leaf) => !leavesToRemoveSet.has(leaf.id));
+    this.leaves.push(...leavesToAdd);
+  }
+  async queryNodes(baseRequest, sparkClientAddress, pageSize = 100) {
+    const address2 = sparkClientAddress ?? this.config.getCoordinatorAddress();
+    const aggregatedNodes = {};
+    let offset = 0;
+    while (true) {
+      const sparkClient = await this.connectionManager.createSparkClient(address2);
+      const response = await sparkClient.query_nodes({
+        ...baseRequest,
+        limit: pageSize,
+        offset
+      });
+      Object.assign(aggregatedNodes, response.nodes ?? {});
+      const received = Object.keys(response.nodes ?? {}).length;
+      if (received < pageSize) {
+        return {
+          nodes: aggregatedNodes,
+          offset: response.offset
+        };
+      }
+      offset += pageSize;
+    }
+  }
 };
 
 // src/utils/mempool.ts